pom changes
Merge branch 'master' into jsf

Conflicts:
	simple-multiproject/pom.xml