fix
pusher and his friend are back
Merge branch 'develop' of github.com:SBS-team/chaaat into develop

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/main.js
	app/assets/javascripts/rooms.js
	app/controllers/rooms_controller.rb
	app/views/layouts/_rooms_list.html.haml
	app/views/rooms/_form.html.haml
	app/views/rooms/_show_rooms_list.html.haml
	db/schema.rb
Merge branch 'develop' into pushers_friends
merger pushers_frineds into develop