fix import bug

remove 'import upload'
--> upload module is integrated into "image"
Merge branch 'dev'