trying to synchronize master with develop
Merge branch 'master' of https://github.com/telefonicaid/fiware-sdc

* 'master' of https://github.com/telefonicaid/fiware-sdc:

Conflicts:
	core/src/main/java/com/telefonica/euro_iaas/sdc/manager/impl/ProductManagerImpl.java
	rest-api/src/main/resources/spring-model-rest-api-config.xml