getuser change
Merge branch 'master' of https://github.com/terriblesarcasm/Dispatchly

Conflicts:
	public/js/app.js