Fixed users.css, applcation_controller
Merge branch 'develop' of github.com:SBS-team/chaaat into upd_room_fr
Sending msg on email offline users, smiles attaching
Fixed
All functionality without fixed smiles and changing status via pusher
correct style
Merge branch 'develop' of github.com:SBS-team/chaaat into develop
Added attached files preview
Merge branch 'develop' of github.com:SBS-team/chaaat into develop
correct style
Merge branch 'develop' into attach_preview

Conflicts:
	app/assets/javascripts/pusher.js
	app/assets/stylesheets/framework_and_overrides.css.scss
	app/assets/stylesheets/users.css.scss
Merge branch 'attach_preview' into develop