fix
Merge branch 'master' of https://github.com/yupe/yupe
small refactoring image upload
small fix
closed #1188