Update pom.xml
Update and rename pom.xml to _pom.xml
Update and rename _pom.xml to pom.xml
Update pom.xml
Update pom.xml
Update pom.xml
Update pom.xml
Update pom.xml
Update pom.xml
Update sonar-project.properties
Update pom.xml
Update pom.xml
Merge branch 'master' of
https://github.com/Hawk30100/de.htwg.se.catanica.git into GameLogic

Conflicts:
	pom.xml
	sonar-project.properties
Merge branch 'master' of https://github.com/Hawk30100/de.htwg.se.catanica.git into GameLogic
Merged Files from Master