Commit to merge with the develop
Merge branch 'develop' of https://github.com/alien4cloud/alien4cloud into features/ALIEN-464

Conflicts:
	alien4cloud-core/src/main/java/alien4cloud/paas/plan/PaaSPlanGenerator.java
Merge branch 'develop' of https://github.com/alien4cloud/alien4cloud into features/ALIEN-464
Merge branch 'develop' of https://github.com/alien4cloud/alien4cloud into features/ALIEN-464
fix bad constant usage
fixed property default value display for a requirement
fixed: node + relationship names generation when too long
 added a utils in JS to get the short name of a component given it tosca elementId
fixed:
- typo in translation
- error in JS console about pagination
-
Merge branch 'features/ALIEN-464' into develop

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