repair pusher status
Merge branch 'pushers_friends' into develop

Conflicts:
	app/assets/javascripts/pusher.js
	app/assets/javascripts/user.js
	app/assets/stylesheets/lobby.css
	app/helpers/application_helper.rb
	app/views/layouts/_rooms_list.html.haml