Merge branch 'release/1.2.0' into develop
updating poms for 1.3.0-SNAPSHOT development
fix changes in order to sync develop with master
Merge pull request #87 from jesuspg/fix_develop

fix changes in order to sync develop with master
more fixes: trying to synchronize master with develop
more fixes: trying to synchronize master with develop
Merge branch 'develop' of https://github.com/jesuspg/fiware-paas into develop

* 'develop' 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 pull request #89 from jesuspg/develop

fix develop
gettin the external network for the name
change from error to warn
Merge branch 'master' of https://github.com/telefonicaid/fiware-paas into bug/foundrouterexternal

Conflicts:
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/util/OpenStackConfigUtilImpl.java
solve the unit test problem
change line lenght
correct test
fix: restore pom
Merge pull request #3 from jesuspg/PR94

fix: restore pom
Merge pull request #94 from hmunfru/bug/foundrouterexternal

Bug/foundrouterexternal