Merge branch 'PeerAssessmentChristian' of...

Merge branch 'PeerAssessmentChristian' of C:\Users\Christian\Desktop\FInalGit\fltrail with conflicts.

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java

 package unipotsdam.gf.modules.assessment.controller.view;
 
 import unipotsdam.gf.interfaces.IPeerAssessment;
+import unipotsdam.gf.modules.assessment.controller.model.Assessment;
 import unipotsdam.gf.modules.assessment.controller.model.*;
 import unipotsdam.gf.modules.assessment.controller.service.PeerAssessmentDummy;