fixing merge and implementing groupTasks annotate, feedback, uploadDossier

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

...am/gf/modules/assessment/controller/model/Categories.java

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

...f/modules/submission/model/SubmissionPartPostRequest.java

...les/submission/model/SubmissionProjectRepresentation.java

...potsdam/gf/modules/submission/view/SubmissionService.java

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

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

...main/webapp/annotation/create-unstructured-annotation.jsp

...n/src/main/webapp/annotation/js/unstructuredAnnotation.js

...orschen/src/main/webapp/annotation/js/unstructuredRest.js

...schen/src/main/webapp/annotation/js/unstructuredUpload.js

gemeinsamforschen/src/main/webapp/taglibs/js/utility.js

gemeinsamforschen/src/test/resources/database/fltrail.sql