removed devise gem
gemlock
Merge branch 'master' into routes