TestCommit
Merge branch 'master' into develop
hopefully added gitignore to master

* master:
  TestCommit

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/de.fau.amos/proj5/pom.properties