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

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

...va/unipotsdam/gf/modules/annotation/model/Annotation.java

...nipotsdam/gf/modules/annotation/model/AnnotationBody.java

...m/gf/modules/annotation/model/AnnotationPatchRequest.java

...am/gf/modules/annotation/model/AnnotationPostRequest.java

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

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

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

...rc/test/java/unipotsdam/gf/interfaces/AnnotationTest.java