Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master

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

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

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

...ipotsdam/gf/modules/journal/model/ProjectDescription.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

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

...m/gf/modules/journal/model/dao/ProjectDescriptionDAO.java

.../modules/journal/model/dao/ProjectDescriptionDAOImpl.java

...tsdam/gf/modules/journal/service/DummyJournalService.java

...m/gf/modules/journal/service/DummyProjectDescription.java

...unipotsdam/gf/modules/journal/service/JournalService.java

...otsdam/gf/modules/journal/service/JournalServiceImpl.java

...am/gf/modules/journal/service/ProjectDescriptionImpl.java

...gf/modules/journal/service/ProjectDescriptionService.java

...java/unipotsdam/gf/modules/journal/util/JournalUtils.java

.../java/unipotsdam/gf/modules/journal/view/JournalView.java

...tsdam/gf/modules/journal/view/ProjectDescriptionView.java

gemeinsamforschen/src/main/webapp/assets/css/e-portfolio.css