CURRIKI-6106 hopefully fixed multiple avatar issue. The user logo is now stored in the avatar field of the user object. Reformated touched macros.