make the maven work
Merge remote-tracking branch 'origin/MyPersistent' into MyPersistent

Conflicts:
	commons/pom.xml