Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Remove avatar upload shit because we don't need that no mo'
Merge pull request #77 from Icarurs/develop

Get rid of avatar upload shit