Avatar update on navbar too
Merge pull request #318 from VitSalis/avatar_on_navbar

Avatar update on navbar too
Merge master