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

...in/java/unipotsdam/gf/core/management/ManagementImpl.java

...va/unipotsdam/gf/core/management/ManagementImpl.java.orig

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

...c/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java

...n/java/unipotsdam/gf/interfaces/IPeerAssessment.java.orig

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

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

...m/gf/modules/assessment/controller/model/Performance.java

...ules/assessment/controller/model/cheatCheckerMethods.java

...essment/controller/service/AssessmentDBCommunication.java

.../modules/assessment/controller/service/FBAssessement.java

...les/assessment/controller/service/FBAssessement.java.orig

...modules/assessment/controller/service/PeerAssessment.java

...es/assessment/controller/service/PeerAssessment.java.orig

...es/assessment/controller/service/PeerAssessmentDummy.java

...sessment/controller/service/PeerAssessmentDummy.java.orig

...es/assessment/controller/service/QuizDBCommunication.java

...tsdam/gf/modules/assessment/controller/view/QuizView.java

gemeinsamforschen/src/main/webapp/assets/js/Quiz-docent.js

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