Get query tool working
Merge branch 'master' of https://github.com/klahnakoski/Qb

Conflicts:
	html/QueryTool.html