finished touch fileUploadPanel
Merge branch 'touchFileUpload'