First PaaS iteration
Merge branch 'master' of https://github.com/SINTEF-9012/cloudml

Conflicts:
	deployer/pom.xml