refs #45 - waiting for api update
Merge branch 'master' into 45

Conflicts:
	pom.xml
	src/main/resources/web/js/cloudconductor-web.js
Merge pull request #57 from cinovo/45

refs #45