add new feature - upload file with jquery.uploadFile
Merge branch 'master' into develop
Merge branch 'develop'