Update version
Merge branch '1.1.0' into develop

Conflicts:
	pom.xml