Merge branch 'hotfix/0.1.10'
Hotfix for CMS
Merge branch 'hotfix/0.1.11' into develop

Conflicts:
	version.sbt