Last minute fixes, and bugs introduced
Merge branch 'master' of https://github.com/eggertj12/ColossalChat

Conflicts:
	js/controllers/ChatCtrl.js