fix dialog
fixing if
Merge branch 'fix_dialog' into js_to_coffee

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/messages.coffee
	app/assets/javascripts/pusher.coffee
	app/assets/javascripts/rooms.coffee