remove uploader.html5
fix conflict
Merge pull request #112 from mycolorway/rc-fix-uploader

remove uploader.html5