WIP #140: Add avatar module

remove all old tries to merge avatars