user models in place
Merge branch 'master' of https://github.com/emtw/evphia