Replaced custom User#password implementation for Rails has_secure_password
Merge branch 'master' into heroku