avatars and user profiles and nav small profile picture
changes
Merge branch 'master' into userprofiles