RPC
Merge branch 'master' of git://github.com/Yuriy-Leonov/intern into Yuriy-Leonov-master

Conflicts:
	VM_Project/client.py
	VM_Project/server_http.py
	VM_Project/settings.py
	VM_Project/vm_template.xml