ALIEN-435 property-display will handle long character property name and display a tooltip for each property label
Jump to protractor 1.31 to handkle e2e test with Firafox 0.32+
ALIEN-435 fixed UI tests
Merge branch 'develop' of https://github.com/alien4cloud/alien4cloud into develop
ALIEN-449 Documentation tour to create a topology (translate todo) + toaster when tour not
Merge branch 'ALIEN-445' into develop
ALIEN-445: delete a wrong path in Gruntfile
Fix back to protractor 0.24.1 version
Fix translation tour
Merge branch 'develop' of https://github.com/alien4cloud/alien4cloud into develop
 - Add exclude to avoid loading clouds and plugins in DAO unit tests.
ALIEN-449 Translation eng
ALIEN-445: Add a condition in controller to solve an error
Fix error detected by Jenkins on quick_search
[ALIEN-455] CSAR explorer editor is now readonly
Merge branch 'develop' of https://github.com/alien4cloud/alien4cloud into develop
Fix hopscotch translation and more
Fix double error message when "tour" is missing
Fix double error message when "tour" is missing
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	alien4cloud-ui/yo/package.json