Updates
Merge branch 'master' of https://github.com/seano314/AeroQuery

Conflicts:
	client/main.html