Add /customavatar
Merge branch 'kupo-base' into kupo