add tooltip
fix
fix
delete room
Merge branch 'develop' of github.com:SBS-team/chaaat into develop

Conflicts:
	app/assets/javascripts/pusher.js
%br
erd.png
add confirm
confirm v2
confirm v2.1
correct style
Merge branch 'develop' of github.com:SBS-team/chaaat into develop
scroll left panel
Merge branch 'develop' of github.com:SBS-team/chaaat into develop
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