login user fixes
fix gemfile
Merge branch 'dev' into test