add username to users and try to allow user to login with username or email
Merge branch 'auth' of github.com:trappist/rewardrocket into auth