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

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/HeadLine.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/ProjectDAO.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/feedback/Controller/PeerFeedbackController.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/feedback/Model/Peer2PeerFeedback.java
#	gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
#	gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
#	gemeinsamforschen/src/main/webapp/feedback/js/peerfeedback.js
#	gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
#	gemeinsamforschen/src/main/webapp/project-student.jsp
#	gemeinsamforschen/src/main/webapp/project/js/overview-student.js
#	gemeinsamforschen/src/main/webapp/project/overview-student.jsp
#	gemeinsamforschen/src/scripts/dbschema/createDummyCourses.sql
#	gemeinsamforschen/src/scripts/dbschema/createDummyUsersGroupsProject.sql
#	gemeinsamforschen/src/scripts/dbschema/peerfeedback