Cleaning up the pom
Merge branch 'master' of github.com:BAXTER-IT/baxter-price

Conflicts:
	pom.xml