Merge branch 'pack'

Conflicts:
	Source/V1.2.0鍗囩骇蹇呯湅.txt
	Source/Web.config
	Source/data/net/ComboBoxData.ashx
	Source/demos/accordion/accordion.htm
	Source/demos/accordion/accordionreload.htm
	Source/demos/base/drag.htm
	Source/demos/base/drag2.htm
	Source/demos/base/drag3.htm
	Source/demos/base/dragresizable.htm
	Source/demos/base/messagebox.htm
	Source/demos/base/resizable.htm
	Source/demos/base/tip.htm
	Source/demos/base/tip2.htm
	Source/demos/base/tree.xml
	Source/demos/case/dbeditgrid2.htm
	Source/demos/case/listpage.htm
	Source/demos/case/week.htm
	Source/demos/comboBox/SelectContact.htm
	Source/demos/comboBox/comboBoxAuto.htm
	Source/demos/comboBox/comboBoxCase001.htm
	Source/demos/comboBox/comboBoxEven.htm
	Source/demos/comboBox/comboBoxGrid.htm
	Source/demos/comboBox/comboBoxGridWitchCondition.htm
	Source/demos/comboBox/comboBoxInterface.htm
	Source/demos/comboBox/comboBoxMul.htm
	Source/demos/comboBox/comboBoxPop.htm
	Source/demos/comboBox/comboBoxSelect.htm
	Source/demos/comboBox/comboBoxSingle.htm
	Source/demos/comboBox/comboBoxSingleCheckBox.htm
	Source/demos/comboBox/comboBoxTable.htm
	Source/demos/comboBox/comboBoxTableMul.htm
	Source/demos/comboBox/comboBoxTree.htm
	Source/demos/comboBox/comboBoxUnSelect.htm
	Source/demos/comboBox/treefrozengrid.htm
	Source/demos/dialog/dialogAll.htm
	Source/demos/dialog/dialogTarget.htm
	Source/demos/dialog/dialogUrl.htm
	Source/demos/dialog/taskbar.htm
	Source/demos/dialog/tip.htm
	Source/demos/dialog/win7.htm
	Source/demos/dialog/window.htm
	Source/demos/filter/filter.htm
	Source/demos/filter/filterwin.htm
	Source/demos/filter/grid.htm
	Source/demos/filter/ligerGrid.showFilter.js
	Source/demos/form/button.htm
	Source/demos/form/checkbox.htm
	Source/demos/form/checkbox2.htm
	Source/demos/form/checkboxList.htm
	Source/demos/form/dateEditor.htm
	Source/demos/form/form.htm
	Source/demos/form/form1.htm
	Source/demos/form/form2.htm
	Source/demos/form/popupEdit1.htm
	Source/demos/form/popupEdit2.htm
	Source/demos/form/radio.htm
	Source/demos/form/radio2.htm
	Source/demos/form/radioList.htm
	Source/demos/form/spinner.htm
	Source/demos/form/spinner2.htm
	Source/demos/form/textbox.htm
	Source/demos/form/textbox2.htm
	Source/demos/form/textbox3.htm
	Source/demos/form/textboxDataType.htm
	Source/demos/form/v118/autoform.htm
	Source/demos/form/v118/autoform2.htm
	Source/demos/form/validator/errorLabelContainer.htm
	Source/demos/form/validator/form2.htm
	Source/demos/form/validator/form3.htm
	Source/demos/form/validator/form4.htm
	Source/demos/form/validator/invalidHandler.htm
	Source/demos/grid/AllOrdersData.js
	Source/demos/grid/AllProductData.js
	Source/demos/grid/CustomersData.js
	Source/demos/grid/CustomersData2.js
	Source/demos/grid/DepartmentData.js
	Source/demos/grid/ProductData.js
	Source/demos/grid/TreeData.js
	Source/demos/grid/TreeDeptData.js
	Source/demos/grid/base/delaydata.htm
	Source/demos/grid/base/draggable.htm
	Source/demos/grid/base/draggable.js
	Source/demos/grid/base/draggable2.htm
	Source/demos/grid/base/fullgrid.htm
	Source/demos/grid/base/normalgrid.htm
	Source/demos/grid/base/rowAttrRender.htm
	Source/demos/grid/base/rownumbers.htm
	Source/demos/grid/base/templategrid.htm
	Source/demos/grid/base/toolbar.htm
	Source/demos/grid/base/twogriddraggable.htm
	Source/demos/grid/checkbox/default.htm
	Source/demos/grid/checkbox/init.htm
	Source/demos/grid/checkbox/memory.htm
	Source/demos/grid/detailgrid/default.htm
	Source/demos/grid/detailgrid/height.htm
	Source/demos/grid/editdetail/detail.htm
	Source/demos/grid/editdetail/detail2.htm
	Source/demos/grid/editgrid/addrow.htm
	Source/demos/grid/editgrid/addrowcombobox.htm
	Source/demos/grid/editgrid/addrowwithdata.htm
	Source/demos/grid/editgrid/addrowwithdata2.htm
	Source/demos/grid/editgrid/editgrideven.htm
	Source/demos/grid/editgrid/editgridupdatecell.htm
	Source/demos/grid/editgrid/getdata.htm
	Source/demos/grid/editgrid/popup.htm
	Source/demos/grid/editgrid/selectDepartment.htm
	Source/demos/grid/editgrid/selectEmp.htm
	Source/demos/grid/editgrid/updaterow.htm
	Source/demos/grid/editrow/editrow.htm
	Source/demos/grid/editrow/editrow2.htm
	Source/demos/grid/example.css
	Source/demos/grid/expandable/addrow.htm
	Source/demos/grid/expandable/editor_numberbox.htm
	Source/demos/grid/expandable/formatter.htm
	Source/demos/grid/expandable/keyToEdit.htm
	Source/demos/grid/expandable/method.htm
	Source/demos/grid/expandable/sorter.htm
	Source/demos/grid/frozen/frozengrid.htm
	Source/demos/grid/frozen/mulheaders.htm
	Source/demos/grid/frozen/treefrozengrid.htm
	Source/demos/grid/groupable/checkbox.htm
	Source/demos/grid/groupable/default.htm
	Source/demos/grid/groupable/detail.htm
	Source/demos/grid/groupable/render.htm
	Source/demos/grid/groupable/total.htm
	Source/demos/grid/header/changeheadertext.htm
	Source/demos/grid/header/columnpercentage.htm
	Source/demos/grid/header/hidecolumn.htm
	Source/demos/grid/header/setcolumns.htm
	Source/demos/grid/header/setcolumnwidth.htm
	Source/demos/grid/mulheader/draggable.htm
	Source/demos/grid/mulheader/frozen.htm
	Source/demos/grid/mulheader/grid1.htm
	Source/demos/grid/mulheader/grid2.htm
	Source/demos/grid/mulheader/grid3.htm
	Source/demos/grid/mulheader/grid4.htm
	Source/demos/grid/mulheader/rowspan.htm
	Source/demos/grid/rowgrid/allowUnSelectRow.htm
	Source/demos/grid/rowgrid/checkrowgrid.htm
	Source/demos/grid/rowgrid/contextmenurowgrid.htm
	Source/demos/grid/rowgrid/dbclickrowgrid.htm
	Source/demos/grid/rowgrid/selectRowButtonOnly.htm
	Source/demos/grid/rowgrid/selectRowGrid.htm
	Source/demos/grid/search/search.htm
	Source/demos/grid/total/group.htm
	Source/demos/grid/total/totalgrid.htm
	Source/demos/grid/total/totalgrid2.htm
	Source/demos/grid/total/totalgridall.htm
	Source/demos/grid/treegrid/draggable.htm
	Source/demos/grid/treegrid/draggable2.htm
	Source/demos/grid/treegrid/edit.htm
	Source/demos/grid/treegrid/editable.htm
	Source/demos/grid/treegrid/render.htm
	Source/demos/grid/treegrid/treegrid.htm
	Source/demos/layout/layoutAutoHeight.htm
	Source/demos/layout/layoutAutoHeightAndDiff.htm
	Source/demos/layout/layoutCenterOnly.htm
	Source/demos/layout/layoutFixedHeight.htm
	Source/demos/layout/layoutFullHeight.htm
	Source/demos/layout/layoutHalfHeight.htm
	Source/demos/layout/layoutHideToggle.htm
	Source/demos/layout/layoutLeftHide.htm
	Source/demos/layout/layoutLeftMiddleOnly.htm
	Source/demos/layout/layoutLeftWidth.htm
	Source/demos/layout/layoutMinWidth.htm
	Source/demos/layout/layoutResizeDisable.htm
	Source/demos/listbox/listboxCheckbox.htm
	Source/demos/listbox/listboxMove.htm
	Source/demos/listbox/listboxMul.htm
	Source/demos/listbox/listboxSingle.htm
	Source/demos/listbox/listboxTable.htm
	Source/demos/menu/evenmenu.htm
	Source/demos/menu/menu.htm
	Source/demos/menu/menubar.htm
	Source/demos/menu/menuicon.htm
	Source/demos/menu/mulmenu.htm
	Source/demos/tab/tabEven.htm
	Source/demos/tab/tabGray.htm
	Source/demos/tab/tabHtml.htm
	Source/demos/tab/tabManager.htm
	Source/demos/tree/case/draggable.js
	Source/demos/tree/case/twotree.htm
	Source/demos/tree/draggable.htm
	Source/demos/tree/expandable.htm
	Source/demos/tree/icon.htm
	Source/demos/tree/json.txt
	Source/demos/tree/json2.txt
	Source/demos/tree/tree.json
	Source/demos/tree/treeData.ashx
	Source/demos/tree/treeData2.ashx
	Source/demos/tree/treecase.htm
	Source/demos/tree/treecheckboxinit.htm
	Source/demos/tree/treedata.htm
	Source/demos/tree/treedbdata.htm
	Source/demos/tree/treeedit.htm
	Source/demos/tree/treeeven.htm
	Source/demos/tree/treehtml.htm
	Source/demos/tree/treemanager.htm
	Source/demos/tree/treemenu.htm
	Source/demos/tree/treenoline.htm
	Source/demos/tree/treeselect.htm
	Source/demos/tree/treeurl.htm
	Source/demos/v120/citylink.js
	Source/demos/v120/editgrid/popup.htm
	Source/demos/v120/editgrid/popup2.htm
	Source/demos/v120/editgrid/selectLink.htm
	Source/demos/v120/form/buttons.htm
	Source/demos/v120/form/buttons2.htm
	Source/demos/v120/form/selectLink.htm
	Source/demos/v120/inject/accordion.htm
	Source/demos/v120/inject/form.htm
	Source/demos/v120/inject/form2.htm
	Source/demos/v120/inject/formAll.htm
	Source/demos/v120/inject/grid.htm
	Source/demos/v120/inject/gridEditable.htm
	Source/demos/v120/inject/gridEditable2.htm
	Source/demos/v120/inject/layout.htm
	Source/demos/v120/inject/tab.htm
	Source/demos/v120/tab/setHeader.htm
	Source/demos/window/content.htm
	Source/demos/window/dialog.htm
	Source/demos/window/loadurl.htm
	Source/demos/window/target.htm
	Source/demos/window/url.htm
	Source/demos/window/welcome.htm
	Source/dotnetdemos/grid/pager/client.aspx
	Source/dotnetdemos/grid/pager/client.aspx.cs
	Source/dotnetdemos/grid/pager/server.aspx
	Source/dotnetdemos/grid/pager/server.aspx.cs
	Source/dotnetdemos/grid/sortable/client.aspx
	Source/dotnetdemos/grid/sortable/client.aspx.cs
	Source/dotnetdemos/grid/sortable/server.aspx
	Source/dotnetdemos/grid/sortable/server.aspx.cs
	Source/dotnetdemos/grid/treegrid/tree.aspx
	Source/dotnetdemos/grid/treegrid/tree.aspx.cs
	Source/index.aspx
	Source/index.htm
	Source/indexdata.js
	Source/lab/formdesign/index.htm
	Source/lab/formdesign/style.css
	Source/lab/generate/index.htm
	Source/lab/generate/index.js
	Source/lab/lab.css
	Source/lab/lab.js
	Source/lib/json2.js
	Source/lib/ligerUI/js/core/base.js
	Source/lib/ligerUI/js/core/inject.js
	Source/lib/ligerUI/js/ligerui.all.js
	Source/lib/ligerUI/js/plugins/ligerAccordion.js
	Source/lib/ligerUI/js/plugins/ligerButton.js
	Source/lib/ligerUI/js/plugins/ligerCheckBox.js
	Source/lib/ligerUI/js/plugins/ligerCheckBoxList.js
	Source/lib/ligerUI/js/plugins/ligerComboBox.js
	Source/lib/ligerUI/js/plugins/ligerDateEditor.js
	Source/lib/ligerUI/js/plugins/ligerDialog.js
	Source/lib/ligerUI/js/plugins/ligerDrag.js
	Source/lib/ligerUI/js/plugins/ligerEasyTab.js
	Source/lib/ligerUI/js/plugins/ligerFilter.js
	Source/lib/ligerUI/js/plugins/ligerForm.js
	Source/lib/ligerUI/js/plugins/ligerGrid.js
	Source/lib/ligerUI/js/plugins/ligerLayout.js
	Source/lib/ligerUI/js/plugins/ligerListBox.js
	Source/lib/ligerUI/js/plugins/ligerMenu.js
	Source/lib/ligerUI/js/plugins/ligerMenuBar.js
	Source/lib/ligerUI/js/plugins/ligerMessageBox.js
	Source/lib/ligerUI/js/plugins/ligerPopupEdit.js
	Source/lib/ligerUI/js/plugins/ligerRadio.js
	Source/lib/ligerUI/js/plugins/ligerRadioList.js
	Source/lib/ligerUI/js/plugins/ligerResizable.js
	Source/lib/ligerUI/js/plugins/ligerSpinner.js
	Source/lib/ligerUI/js/plugins/ligerTab.js
	Source/lib/ligerUI/js/plugins/ligerTextBox.js
	Source/lib/ligerUI/js/plugins/ligerTip.js
	Source/lib/ligerUI/js/plugins/ligerTree.js
	Source/lib/ligerUI/js/plugins/ligerWindow.js
	Source/lib/ligerUI/skins/Aqua/css/ligerui-all.css
	Source/lib/ligerUI/skins/Aqua/css/ligerui-common.css
	Source/lib/ligerUI/skins/Aqua/css/ligerui-dialog.css
	Source/lib/ligerUI/skins/Aqua/css/ligerui-form.css
	Source/lib/ligerUI/skins/Aqua/css/ligerui-grid.css
	Source/lib/ligerUI/skins/Aqua/css/ligerui-layout.css
	Source/lib/ligerUI/skins/Aqua/css/ligerui-menu.css
	Source/lib/ligerUI/skins/Aqua/css/ligerui-tab.css
	Source/lib/ligerUI/skins/Aqua/css/ligerui-tree.css
	Source/lib/ligerUI/skins/Gray/css/all.css
	Source/lib/ligerUI/skins/Gray/css/common.css
	Source/lib/ligerUI/skins/Gray/css/dialog.css
	Source/lib/ligerUI/skins/Gray/css/form.css
	Source/lib/ligerUI/skins/Gray/css/grid.css
	Source/lib/ligerUI/skins/Gray/css/layout.css
	Source/lib/ligerUI/skins/Gray/css/tab.css
	Source/lib/ligerUI/skins/Silvery/css/form.css
	Source/lib/ligerUI/skins/Silvery/css/grid.css
	Source/lib/ligerUI/skins/Silvery/css/layout.css
	Source/lib/ligerUI/skins/Silvery/css/style.css
	Source/lib/ligerUI/skins/ligerui-icons.css
	Source/welcome.htm