mod version
Merge branch 'master' into dev-test1

Conflicts:
	pom.xml
mod version
Merge dev-test1 into master