slanger
Merge branch 'slanger' into develop

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/lobby.css
	app/controllers/application_controller.rb
	app/controllers/users_controller.rb