Solved a bug in a test.
Merge branch 'master' of https://github.com/slipstream/SlipStreamServer

Conflicts:
	jar/src/test/java/com/sixsq/slipstream/user/UserResourceTest.java