improved the upload js function
Merge branch 'development' of github.com:cnlpete/candyCMS-Core into development