Merge branch 'development_master_refactoring_1' of...

...va/unipotsdam/gf/core/management/pageAppearance/Menu.java

...rc/main/java/unipotsdam/gf/core/management/user/Menu.java

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

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

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

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

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

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

gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp

...schen/src/main/webapp/assessment/calculate-assessment.jsp

gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp

...nsamforschen/src/main/webapp/assessment/js/Quiz-docent.js

gemeinsamforschen/src/main/webapp/assessment/js/Quiz.js

...insamforschen/src/main/webapp/assessment/js/createQuiz.js

...forschen/src/main/webapp/assessment/js/finalAssessment.js

gemeinsamforschen/src/main/webapp/assessment/js/takeQuiz.js

gemeinsamforschen/src/main/webapp/assessment/js/viewQuiz.js

...forschen/src/main/webapp/assessment/project-docent_CG.jsp

...forschen/src/main/webapp/assessment/rate-contribution.jsp

gemeinsamforschen/src/main/webapp/assessment/take-quiz.jsp