Merge branch 'validates' into develop
correct style
test-style-deploy
fix github/facebook
Merge branch 'develop' of github.com:SBS-team/chaaat into develop

Conflicts:
	app/models/user.rb