Refactored user avatar to allow for default size
Refactored user avatar to allow for default size
Merge remote-tracking branch 'upstream/user' into user
Merge pull request #626 from sexnothing/user

Admin sortable bug resolve
Fix delete message and complete profile congfig
Merge pull request #627 from liuchuangww/user

Fix delete message and complete profile congfig
Text correction
Fix custom email template
Merge pull request #628 from liuchuangww/user

Fix custom email template
Merge remote-tracking branch 'upstream/user' into user
User module bug fixed