Users is dict
Merge branch 'master' of github.com:Traxmaxx/5A002

Conflicts:
	client/scripts/controllers/chat.js
	client/views/chat.html