more fixes: trying to synchronize master with develop
more fixes: trying to synchronize master with develop
Merge branch 'master' of https://github.com/jesuspg/fiware-paas

* 'master' of https://github.com/jesuspg/fiware-paas:
  more fixes: trying to synchronize master with develop

Conflicts:
	rest-api/src/main/java/com/telefonica/euro_iaas/paasmanager/rest/resources/AbstractEnvironmentResourceImpl.java
Merge branch 'master' of https://github.com/jesuspg/fiware-paas

* 'master' of https://github.com/jesuspg/fiware-paas:
  more fixes: trying to synchronize master with develop

Conflicts:
	rest-api/src/main/java/com/telefonica/euro_iaas/paasmanager/rest/resources/AbstractEnvironmentResourceImpl.java
Merge branch 'master' of https://github.com/jesuspg/fiware-paas

* 'master' of https://github.com/jesuspg/fiware-paas:

Conflicts:
	rest-api/src/main/java/com/telefonica/euro_iaas/paasmanager/rest/resources/AbstractEnvironmentResourceImpl.java
Merge pull request #88 from jesuspg/master

Master