lots more stuff
Merge branch master of github.com:lhl/jquery-uploader