changed some names ("person" is now "user")
Merge branch 'master' of ssh://github.com/tubav/fiteagle