merge w/ master. updates to user models
Merge branch 'master' of github.com:grubbio/grubbio-web
Merge branch 'master' of github.com:grubbio/grubbio-web
merging w/ master