Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Fix and simplify AvatarManager.
Really fix and simplify AvatarManager ;-)
Fix AvatarManager class comment and method order.
Merge pull request #105 from cauchymop/avatarManager

Avatar manager