search_back
Merge branch 'search' into develop

Conflicts:
	.gitignore
	Capfile
	Gemfile
	Gemfile.lock
	app/assets/javascripts/messages.js
	app/controllers/message_controller.rb
	app/controllers/pusher_controller.rb
	app/controllers/rooms_users_controller.rb
	app/helpers/message_helper.rb
	app/models/user.rb
	app/views/layouts/_friends_in_rooms.haml
	app/views/message/_dialog.html.haml
	app/views/message/_room_users.html.haml
	db/schema.rb
	spec/factories/users.rb
	spec/models/user_spec.rb