add upload folder
change medias upload dir
remove old media folder
remove useless folder
Merge branch 'master' into 1.0
Change upload dir
Merge branch 'master' into 1.0