Changed Maven groupId
Merge branch 'master' into benchmark

Conflicts:
	pom.xml