Merge remote-tracking branch 'gitup/development_master' into development_master

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/controller/SubmissionController.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/submission/model/FullSubmissionPostRequest.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java
#	gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js