Merge branch 'annotation_#46-2' into development_master

...rschen/src/main/webapp/assets/css/unstructured-upload.css

...rschen/src/main/webapp/assets/css/upload-unstructured.css

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

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

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

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

...schen/src/main/webapp/assets/js/unstructuredAnnotation.js

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

...mforschen/src/main/webapp/assets/js/unstructuredUpload.js

...mforschen/src/main/webapp/assets/js/uploadUnstructured.js

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

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

...orschen/src/main/webapp/pages/unstructured-annotation.jsp

...samforschen/src/main/webapp/pages/unstructured-upload.jsp

...amforschen/src/main/webapp/pages/upload-unstructured.html

...samforschen/src/main/webapp/pages/upload-unstructured.jsp

gemeinsamforschen/src/scripts/dbschema/fltrail.sql

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