Merge branch 'ALIEN-445' into develop
ALIEN-445: delete a wrong path in Gruntfile
Fixed an issue on bootstrap that prevents clouds to be correctly loaded.
Merge branch 'develop' of https://github.com/alien4cloud/alien4cloud into develop
Alien 445 - As a USER I want to have a resource matching screen before I deploy a topology.
Correct bugs
Merge branch 'develop' of https://github.com/alien4cloud/alien4cloud into develop