changed pom
Merge branch 'master' of https://github.com/RicardoUsbeck/sandbox

Conflicts:
	pom.xml