finished touch fileUploadPanel
Merge branch 'touchFileUpload'
Merge branch 'Route'
Merge branch 'origin/master'
Merge branch 'master'