changed user to two different models: person and user
Merge branch 'master' of github.com:Simplixity/server