# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Controller/PeerFeedbackController.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/Model/Peer2PeerFeedback.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/peerfeedback/View/PeerFeedbackView.java
#	gemeinsamforschen/src/main/webapp/core/overview-student.js
#	gemeinsamforschen/src/main/webapp/feedback/css/viewfeedback.css
#	gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
#	gemeinsamforschen/src/main/webapp/feedback/js/givepeerfeedback.js
#	gemeinsamforschen/src/main/webapp/feedback/js/peerfeedback.js
#	gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
#	gemeinsamforschen/src/main/webapp/project-student.jsp

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/ProjectView.java

refac: OmniDependencies carrys taginputs

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/QuizDBCommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/AssessmentView.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/groupfinding/dummy/service/DummyProjectCreationService.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/groupfinding/view/GroupView.java
#	gemeinsamforschen/src/main/webapp/assessment/js/Quiz-docent.js
#	gemeinsamforschen/src/main/webapp/assessment/js/Quiz.js
#	gemeinsamforschen/src/main/webapp/assessment/js/create-quiz.js
#	gemeinsamforschen/src/main/webapp/core/utility.js
#	gemeinsamforschen/src/main/webapp/journal/edit-description.jsp
#	gemeinsamforschen/src/main/webapp/management/join-project.jsp
#	gemeinsamforschen/src/main/webapp/management/js/overview-docent.js
#	gemeinsamforschen/src/main/webapp/management/js/overview-student.js
#	gemeinsamforschen/src/main/webapp/management/js/project-student.js
#	gemeinsamforschen/src/test/java/unipotsdam/gf/interfaces/ManagementTest.java
#	gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java

# Conflicts:
#	gemeinsamforschen/pom.xml
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IJournal.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/IJournalImpl.java

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/model/Constraints.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ICommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/CommunicationDummyService.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/JournalServiceImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionImpl.java
#	gemeinsamforschen/src/main/webapp/journal/edit-description.jsp
#	gemeinsamforschen/src/main/webapp/management/js/changePhase.js

try to fix merge errors