Merge branch 'master' of github.com:EricTendian/ysupload-nextgen