refs #45 - waiting for api update
refs #54
refs #54
refs #54 - finished modification
CloudInit Scripts
drop RPM require to allow usage of openJDK
Merge pull request #55 from cinovo/cloudinit

Cloudinit
refs #54
Merge branch 'master' into 54
refs #54 - fixes build problems, upgrades to new api
Merge pull request #56 from cinovo/54

refs #54
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
Merge branch 'master' into 51

Conflicts:
	pom.xml