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

gemeinsamforschen/pom.xml

...otsdam/gf/modules/annotation/model/AnnotationMessage.java

...odules/annotation/websocket/AnnotationMessageDecoder.java

...odules/annotation/websocket/AnnotationMessageEncoder.java

...les/annotation/websocket/AnnotationWebSocketEndpoint.java

...insamforschen/src/main/webapp/assets/js/annotationRest.js

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

...forschen/src/main/webapp/assets/js/annotationWebsocket.js

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

gemeinsamforschen/src/scripts/dbschema/fltrail.sql