user#edit updates
Merge branch 'master' of github.com:FrenchBully/chatchat