Testing JSON display
Merge branch 'master' of https://github.com/jried31/SSWS

Conflicts:
	sensite/Sensite/web/query.html
stuff