Merge branch 'master' into develop

Author: d4nt

Web/Scripts/simple.js

@@ -1232,7 +1232,7 @@ var SimpleQueryBuilderViewModel = function () {
                     if (settingTree.Type == 'Filter') {
                         self.addFilter(settingTree);
                     }
-                    if (settingTree.Type == 'Statistics2') {
+                    if (settingTree.Type == 'Summarize') {
                         self.addStatistic(settingTree);
                     }
                     if ($.inArray(settingTree.Type, ['Line Chart', 'Bar Chart', 'Pie Chart']) >= 0) {

Web/Views/Simple/Edit.cshtml

@@ -114,7 +114,7 @@
                 <select class="form-control" name="Column" data-bind="options: AllInputColumnInfos, optionsText: 'Name', optionsValue: 'Index', value: FilterColumnIndex"></select>
             </div>
             <div class="form-group">
-                <select id="Operator" name="Operator" class="form-control" data-bind="options: ValidOperators, optionsText: 'simpleName', optionsValue: 'name',  value: Operator"></select>
+                <select id="Operator" name="Operator" class="form-control" data-bind="options: ValidOperators, optionsText: 'simpleName', optionsValue: 'type',  value: Operator"></select>
             </div>
             @*<div class="form-group">
                     <select class="form-control" name="CompareColumn" data-bind="options: AllInputColumnsPlusEnteredValue, optionsText: 'Name', optionsValue: 'Index', value: FilterCompareColumnIndex, visible: ShowFilterCompareValue"></select>