Merge remote-tracking branch 'remotes/origin/master' into hechu1

# Conflicts:
#	src/core/operation/Select.json
#	src/core/process/Process.java

web/jsFile/upload_action.js

@@ -4,7 +4,7 @@ $(document).ready(function () {
   $(document).off('change',showMsg).on('change','.true-select',showMsg)
 })
 function sendFile() {
-  var fileData =new FormData;
+  var fileData =new FormData();
   var Url4='testfrom.jsp';
   var file=$('.true-select').files;
   if($('.true-select').val()=='')