Updated bcrypt and devise
Merge branch 'update-gems'
Merge branch 'master' into groups-view