user edit and profile changes
Merge branch 'master' of https://github.com/psychobunny/NodeBB