Merge branch 'development_master_refactoring_1' of...

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

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

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

...rschen/src/main/webapp/annotation/css/annotationStyle.css

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

gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp

gemeinsamforschen/src/main/webapp/assessment/Quiz.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/assess-work.js

...nsamforschen/src/main/webapp/assessment/js/create-quiz.js

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

gemeinsamforschen/src/main/webapp/assessment/js/view-quiz.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

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

gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp

gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp