Merge branch 'master' into develop

* master:
  debugging should default to false
continued development on the Query tab
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
continued development on web infrastructure to support various MIME types
CSV data download implemented
addressed issues with file download for Google Chrome
addressing miscellaneous issues
clean up
continued clean up and refactoring
continued clean up and refactoring
simplified markup
swapping icons
fixing layout issues
Merge branch 'develop' into modularization

* develop:
  fixing layout issues
  swapping icons
  simplified markup
  continued clean up and refactoring
  continued clean up and refactoring
  clean up
  addressing miscellaneous issues
  addressed issues with file download for Google Chrome
  CSV data download implemented
  continued development on web infrastructure to support various MIME types
  continued development on the Query tab
  continued development on the Query tab