resolve attribute values
improve macro resolution
fix delete order errors
Merge branch 'task/order_change_delete' into task/add_attribute_type
modify dg migration scripts
fix name resolution according to name composition
Merge remote-tracking branch 'upstream/develop' into task/add_attribute_type
Merge pull request #108 from alberts-tid/task/order_change_delete

fix delete order errors
fix
fix according to comments
fix according to comments
Merge pull request #110 from alberts-tid/task/add_attribute_type

LGTM
Merge branch 'develop' into feature/nid

* develop:
  fix according to comments
  fix according to comments
  fix
  fix name resolution according to name composition
  modify dg migration scripts
  fix delete order errors
  improve macro resolution
  resolve attribute values

Conflicts:
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/manager/impl/TierInstanceManagerImpl.java