Fix for asset flush
Merge branch 'asset' into user
Added doc for custom avatar