WiP: services and controllers
Merge branch 'lifecycle' of https://github.com/alien4cloud/alien4cloud into lifecycle
WiP: services and controllers
Merge branch 'lifecycle' of https://github.com/alien4cloud/alien4cloud into lifecycle

Conflicts:
	alien4cloud-ui/yo/app/scripts/applications/controllers/application.js