Fix how avatars are handled
Refactor avatars to work better
Add username to registration validation
Merge branch 'develop'