Made tests to check all project validations
fixed merge conflicts
Merge branch 'master' into s_working
Removed bcrypt and setup sorcery
Merge branch 'master' of github.com:Sanbornh/hoi_polloi_kitty