update user edit and change avatar
Merge branch 'master' of github.com:ABS-org/we-theme-cdp