recommit of previous updates
Merge branch 'master' of https://github.com/TheMarksman/EventBuzz

Conflicts:
	public/js/MainEvent.js
	zerver/Query.js