So, ich versuche mal wieder alles zu commiten
Merge branch 'develop' of https://github.com/Jather90/AMOS_proj5 into develop

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/de.fau.amos/proj5/pom.properties
Merge branch 'master' into develop