modified:   app/models/user.rb
Merge branch 'master' of github.com:RasoTeam/platform