save
fix bags merge
fix verstka user_profile
fix
Merge branch 'develop' of github.com:SBS-team/chaaat into develop

Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/_rooms_list.html.haml
	app/views/rooms/index.html.haml
	app/views/users/index.html.haml