slanger
Merge branch 'slanger' into develop

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/lobby.css
	app/controllers/application_controller.rb
	app/controllers/users_controller.rb
fix
test deploy
another st fix
Merge branch 'develop' of github.com:SBS-team/chaaat into develop
OMG
check status in mozila
Merge branch 'validates' into develop
fix validate status
some changes 16:03
merge develop