updates for settings page
Merge branch 'auth' of github.com:trappist/rewardrocket into auth