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

...chen/src/main/java/unipotsdam/gf/interfaces/Feedback.java

...nipotsdam/gf/modules/peer2peerfeedback/DummyFeedback.java

...potsdam/gf/modules/peer2peerfeedback/ExampleFeedback.java

...tsdam/gf/modules/peer2peerfeedback/Peer2PeerFeedback.java

...dam/gf/modules/peer2peerfeedback/PeerFeedbackService.java

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

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

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

...insamforschen/src/main/webapp/assets/css/viewfeedback.css

...samforschen/src/main/webapp/assets/js/givepeerfeedback.js

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

...nsamforschen/src/main/webapp/assets/js/project-student.js

...orschen/src/main/webapp/assets/js/project-student.js.orig

gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp

gemeinsamforschen/src/main/webapp/pages/project-student.jsp

...amforschen/src/main/webapp/pages/project-student.jsp.orig

gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp

gemeinsamforschen/src/scripts/dbschema/peerfeedback

.../test/java/unipotsdam/gf/interfaces/ActivityFlowTest.java