switched the base POM version back to an explicit version
Merge branch 'dev'

Conflicts:
	pom.xml