Merge branch 'zf_explain_skn' into 0220

# Conflicts:
#	index/src/main/resources/esmapping/productindex.json

@@ -262,16 +262,6 @@
         "type": "multi_field"
       },
       "brandName": {
-        "type": "string",
-        "store": false,
-        "analyzer": "ik_complex",
-        "search_analyzer": "ik_complex",
-        "copy_to": [
-          "searchField",
-          "searchField_ansj"
-        ]
-      },
-      "brandName": {
         "fields": {
           "brandName": {
             "type": "string",
@@ -732,18 +722,27 @@
       },
       "standardNames": {
         "type": "string",
+<<<<<<< HEAD
         "analyzer": "comma_spliter",
         "copy_to": [
           "searchField",
           "searchField_ansj"
         ]
+=======
+        "analyzer":"comma_spliter"
+>>>>>>> zf_explain_skn
       },
       "standardOnlyNames": {
         "fields": {
           "standardOnlyNames": {
             "type": "string",
+<<<<<<< HEAD
             "index": "not_analyzed",
             "copy_to": "searchField_ansj"
+=======
+            "index":    "not_analyzed",
+            "copy_to":  ["searchField","searchField_ansj"]
+>>>>>>> zf_explain_skn
           },
           "standardOnlyNames_ansj": {
             "type": "string",