version 1.1.0.1
Merge branch 'hotfix/1.1.0.1' into develop

Conflicts:
	pom.xml