change to avoid not to delete the environment
Merge pull request #95 from fiware/bug/CLAUDIA-3766-noexitingsgindeletinginstance

change to avoid not to delete the environment
remove call to filterEqualTiers
Merge pull request #97 from fiware/bug/remove_filterEqualTiers

remove call to filterEqualTiers
updating poms for 1.0.0 release
updating poms for 1.0.0 release
Adding license files...
Some changes in the file due to errors...
updating poms for 1.1.0-SNAPSHOT development
modify header
add header to python files
add utf8
add header to acceptance test folder
Merge pull request #98 from fiware/feature/CLAUDIA-3727

Adding license files...
modify scm in pom.xml
Merge pull request #2 from telefonicaid/feature/pre_release

modify scm in pom.xml
modify contribution policy (formatter)
Merge pull request #3 from telefonicaid/feature/pre_release

modify contribution policy (formatter)
Merge branch 'develop' of https://github.com/hmunfru/fiware-paas into feature/CLAUDIA-3735-SecurityinSDC

Conflicts:
	rest-api/src/main/java/com/telefonica/euro_iaas/paasmanager/rest/resources/EnvironmentInstanceResourceImpl.java
resolve merge