continued development on the Query tab
Merge branch 'develop' of github.com:ldaniels528/trifecta into develop

* 'develop' of github.com:ldaniels528/trifecta:
  continued development on the Query tab

Conflicts:
	src/main/resources/app/index.htm
	src/main/resources/app/js/QueryCtrl.js