host maintansce
Merge branch 'vmhost' of github.com:ZHAndyWu/Eisenbahn into host

Conflicts:
	Shared/sync_utils.py
Merge branch 'master' of github.com:ZHAndyWu/Eisenbahn into host

Conflicts:
	Eisenbahndamm/tests/test_vm_host.py
	Eisenbahndamm/vm_tools.py
	Eisenbahndamm/warehouse/db_utils.py
	Eisenbahndamm/warehouse/depository.py
	Eisenbahndamm/warehouse/models.py
Merge branch 'master' of github.com:ZHAndyWu/Eisenbahn into vmhost

Conflicts:
	Eisenbahndamm/tests/test_vm_host.py
	Eisenbahndamm/vm_tools.py
	Eisenbahndamm/warehouse/db_utils.py
	Eisenbahndamm/warehouse/depository.py
	Eisenbahndamm/warehouse/models.py
	Shared/sync_utils.py
add vm to category
remove vm from category
add api add_vm remove_vm
fix
vm list
Merge branch 'host' of github.com:ZHAndyWu/Eisenbahn into host
change igonore
Merge branch 'vmhost' of github.com:ZHAndyWu/Eisenbahn into host

Conflicts:
	Eisenbahndamm/vm_tools.py
	Eisenbahndamm/warehouse/models.py
	Shared/sync_utils.py
add category to vm
Merge branch 'vmhost' of github.com:ZHAndyWu/Eisenbahn into host
fix error for api
Merge branch 'vmhost' of github.com:ZHAndyWu/Eisenbahn

Conflicts:
	Eisenbahndamm/tests/test_vm_host.py
	Eisenbahndamm/vm_tools.py
	Eisenbahndamm/warehouse/db_utils.py
	Eisenbahndamm/warehouse/depository.py
	Eisenbahndamm/warehouse/models.py