Merge changes from master
Added bcrypt functionality
Merge branch 'master' into survey_routes