Refactored part of VirtualServerResource class
Merge branch 'master' of https://github.com/n3phele/openstack-factory

Conflicts:
	src/n3phele/factory/rest/impl/VirtualServerResource.java