...
...
Merge branch 'master' of https://github.com/vedannt/hausbauWS.git

Conflicts:
	.gitignore
	target/m2e-wtp/web-resources/META-INF/maven/com.vedannt/hausbauWS/pom.properties
	target/m2e-wtp/web-resources/META-INF/maven/com.vedannt/hausbauWS/pom.xml