Merge branch 'develop' into feature/profile
Resize avatars to 128x128
Merge branch 'feature/profile' into develop