further changed version
changed hierarchy and renamed property
Merge remote-tracking branch 'remotes/origin/iss53' into iss53

Conflicts:
	pom.xml
merged remote changes