add secure password to user model
Merge branches 'master' and 'modeling-users'