Updated query and upload data pages

Updated interface, added Google Map and JSON table display
Merge branch 'master' of https://github.com/jried31/SSWS

Conflicts:
	sensite/Sensite/web/query.html