fix again
Merge branch 'poadev' of https://github.com/n3phele/n3phele-core into poadev

Conflicts:
	core-frontend/src/n3phele/service/rest/impl/VirtualServerResource.java
merge