gregors tests
Merge branch 'master' of https://github.com/cloudmesh/cloudmesh

Conflicts:
	webui/server.py
	webui/templates/inventory_cluster_table.html