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

Conflicts:
	app/assets/javascripts/pusher.js