CFY-977 bump version to 1.1
Merge branch 'develop'

Conflicts:
	nova_plugin/VERSION