pom properties
Merge branch 'code-lab-clean' into java-integration

Conflicts:
	pom.xml
pom formatting