incrementing core version
Merge branch 'develop'

Conflicts:
	pom.xml