as part of contextualisation data connectors should now export CLOUDCONNECTOR_BUNDLE_URL for Orchestrator to recover the Python cloud connector or driver.
set category when adding enumerator parameter.
added helper method to update service configuration parameters with cloud connector specific ones.
added CLOUDCONNECTOR_PYTHON_MODULENAME field to define and provide to the Orchestrator the location of the corresponding Python connector module via the contextualisation environment variable CLOUDCONNECTOR_PYTHON_MODULENAME.
Removed "cloud.connector" prefix in system parameters.
Reshuffled (User,System,Image) parameters in all connectors.
Merge branch 'master' of https://github.com/slipstream/SlipStreamServer

Conflicts:
	jar/src/main/java/com/sixsq/slipstream/connector/openstack/OpenStackConnector.java
Now system parameters are merged by default into User object except on the web interface.
Minors in StratusLab parameters.
Updated connectors to comply to the new Connector interface.
Minor fix.
Minors
substituted abstract method getOrchestratorImageId() with implementation. Orch image ID is the mandatory reference parameter which gets set on each connector instance configuration (except Physical connector, where getOrchestratorImageId() gets overriden).
Removed some hardcoded parameters names.
Merge branch 'master' of https://github.com/slipstream/SlipStreamServer

Conflicts:
	jar/src/main/java/com/sixsq/slipstream/connector/local/LocalConnector.java
	jar/src/main/java/com/sixsq/slipstream/connector/openstack/OpenStackConnector.java
	jar/src/main/java/com/sixsq/slipstream/connector/stratuslab/StratusLabConnector.java
updated regex to allow dashes in the name of the Orchestrator node name: e.g. orchestrator-ec2-us-east-1.
Added cookie controlled system parameter merge
Applies to user parameters olny
Merge branch 'master' of https://github.com/slipstream/SlipStreamServer
Completed cookie controlled sys param merge into user params
Added test and using instance name rather than default service name
Merge branch 'master' into new-ui

Conflicts:
	jar/src/main/java/com/sixsq/slipstream/connector/ConnectorBase.java
	jar/src/main/java/com/sixsq/slipstream/cookie/CookieUtils.java
	jar/src/main/java/com/sixsq/slipstream/persistence/UserParameter.java