Minor
Merge branch 'master' of https://github.com/slipstream/SlipStreamServer

Conflicts:
	jar/src/main/java/com/sixsq/slipstream/connector/ConnectorFactory.java