Merge remote-tracking branch 'origin/PeerAssessmentChristian_2' into development_master_refactoring_1

# Conflicts:
#	gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java