fix confirmation
Merge branch 'develop' of github.com:SBS-team/chaaat into heroku_deploy

Conflicts:
	app/models/user.rb