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

...c/main/java/unipotsdam/gf/config/GFApplicationBinder.java

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

...c/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java

...les/assessment/controller/model/ContributionCategory.java

...modules/assessment/controller/model/FullContribution.java

...m/gf/modules/assessment/controller/model/Performance.java

...essment/controller/service/AssessmentDBCommunication.java

...modules/assessment/controller/service/PeerAssessment.java

...tsdam/gf/modules/assessment/controller/view/QuizView.java

...ipotsdam/gf/modules/fileManagement/FileManagementDAO.java

...sdam/gf/modules/fileManagement/FileManagementService.java

.../java/unipotsdam/gf/modules/journal/model/EPortfolio.java

...ain/java/unipotsdam/gf/modules/journal/model/Journal.java

...va/unipotsdam/gf/modules/journal/model/JournalFilter.java

...c/main/java/unipotsdam/gf/modules/journal/model/Link.java

...ipotsdam/gf/modules/journal/model/ProjectDescription.java

.../java/unipotsdam/gf/modules/journal/model/Visibility.java

...a/unipotsdam/gf/modules/journal/model/dao/JournalDAO.java

...ipotsdam/gf/modules/journal/model/dao/JournalDAOImpl.java

...java/unipotsdam/gf/modules/journal/model/dao/LinkDAO.java