Versuch, im Develop-branch was zu pushen
Merge branch 'develop' of https://github.com/Jather90/AMOS_proj5 into develop

Conflicts:
	target/m2e-wtp/web-resources/META-INF/MANIFEST.MF