changed the query functions to be protocol based functions
Merge branch 'master' of https://github.com/cloudmesh/cloudmesh

Conflicts:
	webui/templates/layout.html