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

...rc/main/java/unipotsdam/gf/core/management/user/Menu.java

...f/modules/annotation/controller/AnnotationController.java

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

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

...amforschen/src/main/webapp/assets/css/annotationStyle.css

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

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

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

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

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

...samforschen/src/main/webapp/pages/annotation-document.jsp

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

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

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

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

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

gemeinsamforschen/src/scripts/dbschema/fltrail.sql