cleanup
Merge branch 'master' into develop

Conflicts:
	pom.xml
test
Merge branch 'master' into develop
test
updating poms for branch'release-1.0-Sprint_01' with non-snapshot versions
Merge branch 'release-1.0-Sprint_01'