Merge remote-tracking branch 'origin/master' into ui-ryan
Merge branch 'master' of github.com:12apps/app1 into ui-ryan
Add full width input chat box, add hidden user box when mobile
Merge remote-tracking branch 'origin/ui-ryan'

Conflicts:
	views/index.hbs