added bcrypt
merge
Merge branch 'registation2'