Merge branch 'hotfix/avatar'
Merge branch 'develop'
Merge branch 'develop'
remove uploads for mgit
set ignore public
remove uploads from public