Adding avatars folder
Allow Users to upload avatars
Merge branch 'master' into find2
temporarily left last column out of groups