Always create service catalog resource
Corrected resource url prefix and refactored overriding of proposed parameters
Metering enabled is boolean
Complete persistence logic and check enabled
Merge branch 'master' of https://github.com/slipstream/SlipStreamServer

Conflicts:
	jar-service/src/main/java/com/sixsq/slipstream/application/RootApplication.java
Merge branch 'master' of https://github.com/slipstream/SlipStreamServer
Remove version since now provided by parent
Clean imports
Move service catalog enabled check to service catalogs resource