fix merge errors and fix clickpath for feedback

...nipotsdam/gf/core/management/pageAppearance/HeadLine.java

...ava/unipotsdam/gf/core/management/project/ProjectDAO.java

...dback/peerfeedback/Controller/PeerFeedbackController.java

.../peerfeedback/Controller/PeerFeedbackController.java.BASE

...peerfeedback/Controller/PeerFeedbackController.java.LOCAL

...eerfeedback/Controller/PeerFeedbackController.java.REMOTE

...dback/Controller/PeerFeedbackController_BACKUP_13120.java

...eedback/Controller/PeerFeedbackController_BASE_13120.java

...edback/Controller/PeerFeedbackController_LOCAL_13120.java

...dback/Controller/PeerFeedbackController_REMOTE_13120.java

...er2peerfeedback/peerfeedback/Model/Peer2PeerFeedback.java

...peer2peerfeedback/peerfeedback/View/PeerFeedbackView.java

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

gemeinsamforschen/src/main/webapp/core/overview-student.js

...samforschen/src/main/webapp/feedback/css/viewfeedback.css

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

...mforschen/src/main/webapp/feedback/js/givepeerfeedback.js

...mforschen/src/main/webapp/feedback/js/viewpeerfeedback.js

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

gemeinsamforschen/src/main/webapp/overview-student.jsp