Merge branch 'documentation' of https://github.com/hmunfru/fiware-paas into develop
Merge branch 'develop' of https://github.com/telefonicaid/fiware-paas into develop
Removing default connection values
Merge pull request #85 from jmmovilla/bug/CLAUDIA-4234

Removing default values to connection data to the database
Merge pull request #81 from hmunfru/fromaster

LGTM
upgrade product release
updating poms for 1.2.0 release
updating poms for 1.2.0 release
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
Merge branch 'develop' of https://github.com/telefonicaid/fiware-paas into feature/addingudprules