fix bug: fix cannot upload avatar bug
Merge branch 'production' of git.collipa.com:collipa into production
Merge branch 'development'
Merge branch 'master' of github.com:yetone/collipa