pusher hooks, new notifications
Merge branch 'new_notify' of github.com:SBS-team/chaaat into develop

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/messages.js
	app/assets/javascripts/pusher.js
	app/assets/stylesheets/application.css.scss
	app/controllers/application_controller.rb
	app/controllers/message_controller.rb
	app/controllers/pusher_controller.rb
	app/controllers/rooms_controller.rb
	app/controllers/rooms_users_controller.rb
	app/models/message.rb
	app/models/room.rb
	app/views/layouts/_rooms_list.html.haml
	app/views/message/_dialog.html.haml
	config/routes.rb
Merge branch 'new_notify' into develop

Conflicts:
	app/assets/javascripts/messages.js
	app/assets/javascripts/pusher.js
	app/assets/stylesheets/application.css.scss
	app/controllers/application_controller.rb
	app/controllers/rooms_users_controller.rb
	app/models/message.rb
	app/views/layouts/_rooms_list.html.haml
	config/routes.rb