pom properties
Merge remote-tracking branch 'origin/code-lab-clean' into javaee-web

Conflicts:
	pom.xml
pom formatting