add vmmanager stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	image_resizer_server/src/image_resizer_server/VMManager.java