implimented devise for users
Merge branch 'master' into old-state