fixing merge and implementing groupTasks annotate, feedback, uploadDossier

...otsdam/gf/modules/annotation/controller/FeedbackImpl.java

...f/modules/submission/controller/SubmissionController.java

...nipotsdam/gf/modules/submission/model/FullSubmission.java

...in/java/unipotsdam/gf/process/DossierCreationProcess.java

...en/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java

...rschen/src/main/webapp/annotation/annotation-document.jsp