validates
Merge branch 'develop' of github.com:SBS-team/chaaat into develop
fix
Merge branch 'validates' into develop
correct style
test-style-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
message.js to message.coffee
fix github/facebook
Merge branch 'develop' of github.com:SBS-team/chaaat into develop

Conflicts:
	app/models/user.rb
fix js
fix js part2
change room topic and change stylesheet
edit user form