upgrade versions so build doesnt break
Merge branch 'master' into semantic

Conflicts:
	app/pom.xml
	feature/pom.xml