version increment
Merge branch 'master' into portico

Conflicts:
	pom.xml