commit ROOT.war as required for the lecture
sprint_11_planning
Adding a textarea to the upload form
Extract meta data from bibtex
Merge branch 'feature_BibTexMetaData' into dev

Conflicts:
	src/main/java/de/fau/osr/amos/docmatic/FileUploadPage.java
Merge branch 'dev' of https://github.com/t-animal/DocMatic into dev