Added delete resource descriptor operation
Added delete resource descriptor operation
Merge branch '1.1-SNAPSHOT' of https://github.com/myriadeas/integral into 1.1-SNAPSHOT

Conflicts:
	integral-core/src/main/resources/META-INF/spring/cataloguing2ServiceRouteContext.xml