Преглед на файлове

Merge branch 'push-dev-filter' of http://192.168.2.236:10080/louhr/push into push-dev-filter

kongwz преди 5 години
родител
ревизия
8f06259264

+ 1 - 1
bigdata-web/src/main/java/org/diagbot/bigdata/common/ApplicationCacheUtil.java

@@ -129,7 +129,7 @@ public class ApplicationCacheUtil {
     public static Map<String, List<Map<String, String>>> createKl_result_mapping_standword_map() {
         kl_result_mapping_standword_map = new HashMap<>();
         Configuration configuration = new DefaultConfig();
-        List<String> fileContents = configuration.readFileContents("kl_result_mapping_standword.dict");
+        List<String> fileContents = configuration.readFileContents("bigdata_value_analyze.dict");
         List<Map<String, String>> standWordObjValList = null;
         Map<String, String> standWordObjVal = null;
         String operation = ">=|≥|>|大于|>|超过|<=|≤|<|小于|<|少于";

+ 1 - 1
bigdata-web/src/main/resources/bigdata_diag_2_dept.dict

@@ -382,7 +382,7 @@ Od0k7somw0+ognNgz49kBq1TqwiA1pre
 neSRPR/Dc1r+5avra8D+/N7SGlS0JFuG
 NPyf8uRLdZAxgppd7vKR30iU8imBtrfgy4x6AQXguls=
 EMu7srLgFkT8KlV1ph0Yje1sIpk3UltPRPB+qQ9rdKU=
-x9PLCfVsCr/aY475fTCHFCJCwkfSBhWqy4x6AQXguls=
+x9PLCfVsCr/aY475fTCHFO1sIpk3UltPRPB+qQ9rdKU=
 x9PLCfVsCr+l3V44t9O2VSJCwkfSBhWqy4x6AQXguls=
 x9PLCfVsCr+UayicXLX+aCJCwkfSBhWqy4x6AQXguls=
 gre6Tf1xXnA8kiJVq+hjxkoPmHAI4936

+ 13 - 0
common-push/src/main/java/org/diagbot/common/push/cache/CacheFileManager.java

@@ -304,6 +304,19 @@ public class CacheFileManager {
                 fw.write("\n");
             }
             fw.close();
+
+            path = this.getClass().getClassLoader().getResource("").getPath();
+            path = path.substring(0, path.indexOf("target"));
+            sql = "SELECT lib_name FROM kl_concept WHERE is_deleted = 'N' AND lib_type = 70 AND lib_name regexp '[0-9]'";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+
+            fw = new FileWriter(path + "bigdata_value_analyze.dict");
+            while (rs.next()) {
+                fw.write(encrypDES.encrytor(rs.getString(1)));
+                fw.write("\n");
+            }
+            fw.close();
         } catch (IOException ioe) {
             ioe.printStackTrace();
         } catch (SQLException sqle) {

+ 60 - 70
graph/src/main/java/org/diagbot/graph/util/CacheUtil.java

@@ -28,13 +28,11 @@ public class CacheUtil {
     public static Map<String,String> createDiagDepartCache(){
         String path = "graph_diag_2_dept.dict";
         Configuration configuration = new DefaultConfig();
-        if(doc_result_mapping_diag_map == null){
-            doc_result_mapping_diag_map = new HashMap<>();
-            List<String> contentList = configuration.readFileContents(path);
-            for (String s:contentList) {
-                String[] splits = s.split("\\|");
-                doc_result_mapping_diag_map.put(splits[0],splits[1]);
-            }
+        doc_result_mapping_diag_map = new HashMap<>();
+        List<String> contentList = configuration.readFileContents(path);
+        for (String s:contentList) {
+            String[] splits = s.split("\\|");
+            doc_result_mapping_diag_map.put(splits[0],splits[1]);
         }
         return doc_result_mapping_diag_map;
     }
@@ -50,27 +48,25 @@ public class CacheUtil {
     public static Map<String,Integer> createDiagClassifyJiCache(){
         String path = "graph_diag_normalize.dict";
         Configuration configuration = new DefaultConfig();
-        if(diagClassifyJiMap == null){
-            diagClassifyJiMap = new HashMap<>();
-            List<String> contentList = configuration.readFileContents(path);
-            String diagName =null,bigdiagName=null;
-            String[] diagSort =null;String[] split = null;
-            for (String s:contentList) {
-                String[] splits = s.split("\\|");
-                if (splits.length >= 2) {
-                    diagName = splits[0].trim();//疾病本体
-                    bigdiagName = splits[1].trim();//疾病大类
-                    split = bigdiagName.split("\\、");
-                    for (String dis:split) {
-                        diagClassifyJiMap.put(dis, 2);
-                    }
-                    diagClassifyJiMap.put(diagName,1);
-                    if (splits.length == 3) {
-                        diagSort = splits[2].split("\\、");
-                        for (String dis : diagSort) {
-                            if (StringUtils.isNotEmpty(dis.trim())) {
-                                diagClassifyJiMap.put(dis.trim(), 3);
-                            }
+        diagClassifyJiMap = new HashMap<>();
+        List<String> contentList = configuration.readFileContents(path);
+        String diagName =null,bigdiagName=null;
+        String[] diagSort =null;String[] split = null;
+        for (String s:contentList) {
+            String[] splits = s.split("\\|");
+            if (splits.length >= 2) {
+                diagName = splits[0].trim();//疾病本体
+                bigdiagName = splits[1].trim();//疾病大类
+                split = bigdiagName.split("\\、");
+                for (String dis:split) {
+                    diagClassifyJiMap.put(dis, 2);
+                }
+                diagClassifyJiMap.put(diagName,1);
+                if (splits.length == 3) {
+                    diagSort = splits[2].split("\\、");
+                    for (String dis : diagSort) {
+                        if (StringUtils.isNotEmpty(dis.trim())) {
+                            diagClassifyJiMap.put(dis.trim(), 3);
                         }
                     }
                 }
@@ -90,28 +86,26 @@ public class CacheUtil {
     public static Map<String,String> createDiagClassifyCache(){
         String path = "graph_diag_normalize.dict";
         Configuration configuration = new DefaultConfig();
-        if(diagClassifyMap == null){
-            diagClassifyMap = new HashMap<>();
-            List<String> contentList = configuration.readFileContents(path);
-            String diagName =null,bigdiagName=null;
-            String[] diagSort =null;String[] split =null;
-            for (String s:contentList) {
-                String[] splits = s.split("\\|");
-                if (splits.length >= 2) {
-                    diagName = splits[0].trim();//疾病本体
-                    bigdiagName = splits[1].trim();//疾病大类
-                    split = bigdiagName.split("\\、");
-                    for (String dis:split
-                            ) {
-                        diagClassifyMap.put(dis, diagName);
-                    }
+        diagClassifyMap = new HashMap<>();
+        List<String> contentList = configuration.readFileContents(path);
+        String diagName =null,bigdiagName=null;
+        String[] diagSort =null;String[] split =null;
+        for (String s:contentList) {
+            String[] splits = s.split("\\|");
+            if (splits.length >= 2) {
+                diagName = splits[0].trim();//疾病本体
+                bigdiagName = splits[1].trim();//疾病大类
+                split = bigdiagName.split("\\、");
+                for (String dis:split
+                        ) {
+                    diagClassifyMap.put(dis, diagName);
+                }
 
-                    if (splits.length == 3) {
-                        diagSort = splits[2].split("\\、");
-                        for (String dis : diagSort) {
-                            if (StringUtils.isNotEmpty(dis.trim())) {
-                                diagClassifyMap.put(dis.trim(), bigdiagName);
-                            }
+                if (splits.length == 3) {
+                    diagSort = splits[2].split("\\、");
+                    for (String dis : diagSort) {
+                        if (StringUtils.isNotEmpty(dis.trim())) {
+                            diagClassifyMap.put(dis.trim(), bigdiagName);
                         }
                     }
                 }
@@ -151,20 +145,18 @@ public class CacheUtil {
     public static Map<String,Map<String,String>> createSexAgeCache(){
         String path = "graph_sex_age_filter.dict";
         Configuration configuration = new DefaultConfig();
-        if(sexAgeMap == null){
-            sexAgeMap = new HashMap<>();
-            List<String> contentList = configuration.readFileContents(path);
-            for (String s:contentList) {
-                Map<String,String> contentMap = new HashMap<>();
-                String[] splits = s.split("\\|");
-                String sexTyep = splits[1];
-                String min_age = splits[2];
-                String max_age = splits[3];
-                contentMap.put("sexType",sexTyep);
-                contentMap.put("min_age",min_age);
-                contentMap.put("max_age",max_age);
-                sexAgeMap.put(splits[0],contentMap);
-            }
+        sexAgeMap = new HashMap<>();
+        List<String> contentList = configuration.readFileContents(path);
+        for (String s:contentList) {
+            Map<String,String> contentMap = new HashMap<>();
+            String[] splits = s.split("\\|");
+            String sexTyep = splits[1];
+            String min_age = splits[2];
+            String max_age = splits[3];
+            contentMap.put("sexType",sexTyep);
+            contentMap.put("min_age",min_age);
+            contentMap.put("max_age",max_age);
+            sexAgeMap.put(splits[0],contentMap);
         }
         return sexAgeMap;
     }
@@ -179,13 +171,11 @@ public class CacheUtil {
     public static Map<String,String> createVitalCache(){
         String path = "graph_vital_convert.dict";
         Configuration configuration = new DefaultConfig();
-        if(vitalMap == null){
-            vitalMap = new HashMap<>();
-            List<String> contentList = configuration.readFileContents(path);
-            for (String s:contentList) {
-                String[] splits = s.split("\\|");
-                vitalMap.put(splits[0],splits[1]);
-            }
+        vitalMap = new HashMap<>();
+        List<String> contentList = configuration.readFileContents(path);
+        for (String s:contentList) {
+            String[] splits = s.split("\\|");
+            vitalMap.put(splits[0],splits[1]);
         }
         return vitalMap;
     }

+ 1 - 1
graph/src/main/resources/graph_diag_2_dept.dict

@@ -382,7 +382,7 @@ Od0k7somw0+ognNgz49kBq1TqwiA1pre
 neSRPR/Dc1r+5avra8D+/N7SGlS0JFuG
 NPyf8uRLdZAxgppd7vKR30iU8imBtrfgy4x6AQXguls=
 EMu7srLgFkT8KlV1ph0Yje1sIpk3UltPRPB+qQ9rdKU=
-x9PLCfVsCr/aY475fTCHFCJCwkfSBhWqy4x6AQXguls=
+x9PLCfVsCr/aY475fTCHFO1sIpk3UltPRPB+qQ9rdKU=
 x9PLCfVsCr+l3V44t9O2VSJCwkfSBhWqy4x6AQXguls=
 x9PLCfVsCr+UayicXLX+aCJCwkfSBhWqy4x6AQXguls=
 gre6Tf1xXnA8kiJVq+hjxkoPmHAI4936

+ 9 - 9
graph/src/main/resources/graph_diag_normalize.dict

@@ -1,4 +1,3 @@
-9K+PZ38Hd/1bK60dslh9jD08xZT/RFfX6nQY8kcF6f6Q3pCfQMdEPfSvj2d/B3f9Tj6O+pMPrIRmq1tUfM7NXEw+ew7Midqlfcmfdvs36w05mxVKRDBSCg==
 csx+mzURhJ9wBHXy23rFCqELYR/Ge6SfJguv40zsenLdteW2LzNMtrg0JQEm9dDbB1G+0rUX/fo=
 bK8Zpab/PptNYls6bckCK2qOH6CihZwfKfesZepD1yCYOEv7G+Opo+vBv5hwZW/eVnsuGILD+YJwkU050adHZc9nrcMQ3QcNfldHWCrTN51y47LOmx/liqE23F9pxjrKlKBI0b+VWyI=
 B6XhfErTTJgvNY+AQau22C5XZpH9F868vBWNDVn69QQR0SGjmGqDDcCM58ZMX4o+ZXyFPMW0ii/Ny1CxCM0j0dpXXmClQOUaVGET9rz6vA+1//CUvL5M1g==
@@ -15,11 +14,12 @@ anqc376RwxF+Tyu5VoFlKqXxSD+f1O2vC5YOy19B3S1HJbFtXbY5u4s87+ChjgP9RyWxbV22ObuxUtK/
 +8iGrGjQRQXLJRvWtAt1iYU809Pr5+wg80e6b34+k3qaoMeR3HYQyn6/oN57/v4WReElQJ+Fc6O3OV7VztniKXRpb7y0gLlK8W4jXgAgFfPwHLNp0tAohzUX4TxTFrGq
 8n8zV92Zv6lIoOZPZs0HwgrZxL5wy5xjD7Bi/O7j4pT7gtDvhBGfLPJ/M1fdmb+pEWTgRjnEzOg=
 u9VShjNiQLYp+RSWAxFgMbvVUoYzYkC2ltZE6uLO1Pi1rPvw0grsulq9P1+cZSODCwy1ps4giW8=
-qvpIupBm2WU5l5OJw2EvIw==
-jryElcwKEMNxLBNTp+QtPZEB7UNvPo5kknnMZ+j6KVg=
-8iRAY6UGp0bV9dVH/8Qm5qIHTB7Ij1fOi35LjiCAO+Q=
-6uJVi7VzfR8sc8AAqY/c+ttrZ3x7ELQoYEOoage28zr0QB6PuRppXg==
-fMSADmyw8MW8FOmzMncHvpQV7Ysdg03qYz4zvER6wEvEtOpasjBcV/RB3GtJVgXci3ZCuM64HWS7PReC8mKJskLIwxcodHrS
-Mpws87qKqdWbZLCftYQH50stTN0x7PKs59Ar4HjN2sZKYBGd+lGX+w==
-CXAPCKJ5Li6sUZOVx33W77qZTYBpQ5d+
-tQqyk3JtpQRXSrv36QVx/9OgcHrFSUCzdK1XVvKzJ0l0Ua+AtfLnbbqZTYBpQ5d+
+8iRAY6UGp0ZHx0kDnBI0Nw==
++812jhbb/MJhfXGLID+DlwxRxeTVAFkvYOZixauU4eTd+y6m1O88oFtp4WO3PIgD3kmRiT3OXjE5mxVKRDBSCg==
+Thq2mIfRTdi8HjJqAapif3HGqSANjrPk46l6odDdybZ7931x1g5o6A==
+D9iqnam7Yfoa0qg8bmfF3LHlA9wBrWx+ufVPiiOmV0hMiRa0swEh6ujKJMEWgysL8MyCfQrPgEDcLM1uKWDR6A==
+jryElcwKEMNxLBNTp+QtPcABu4eI4LB8QeHwvQQERmz7CWUBu8Xt4g==
+jryElcwKEMNxLBNTp+QtPdTFb5ABt88d80Yks8seiImCWssGNlBOow==
+tQqyk3JtpQQFxx03+fXn9GMfugqnc4VMhuJk9zPPTm+YD9A+Yx3rdazLO3h9qz3/
+kQHtQ28+jmQArPJrd/bUjJEB7UNvPo5kaH9Yc7Wy6H+RAe1Dbz6OZHuruyPH85zpkQHtQ28+jmSSecxn6PopWA==
+9K+PZ38Hd/1bK60dslh9jD08xZT/RFfX6nQY8kcF6f6Q3pCfQMdEPfSvj2d/B3f9Tj6O+pMPrIRmq1tUfM7NXEw+ew7Midqlfcmfdvs36w05mxVKRDBSCg==

+ 2 - 2
graph/src/main/resources/graph_vital_convert.dict

@@ -471,7 +471,7 @@ CsDKBKvWfT5bbRy49IYTt8qtUJ0mpJv3
 yvOBbTrbEUqK3KXUbQsrtCv6f5Xex4IB
 R5EuwxlTHhiyIy8uOmfnksjPdsjefYU+
 VnrAleiz9BccTScttLEkfMjPdsjefYU+
-2s+Nci9wvweK3KXUbQsrtCv6f5Xex4IB
+2s+Nci9wvweKQE9q0AwMBV8KQmsJAL/q/FRS7OcKkCw=
 4e57L86IhfwbuzICqAOsYEpgEZ36UZf7
 kRhgvUdsqlTym7F+DfnexqrHk0o9byPJ+CLPmA1ccPY=
 GJY7cDckFDlGEkXNT9x//B7mEd1pUS95
@@ -694,7 +694,7 @@ uGud2QQCmke6gqIw26BlTQVeznvoamkjBiNf+1YVhVY=
 kDiWMe1LBSmUo3/lbpUcWYh2rvPoq4ANqhMv2Ou59Rw=
 LesXilJbw1zusSbYUrW00gVeznvoamkjBiNf+1YVhVY=
 LesXilJbw1x+HAEtzamshQVeznvoamkjBiNf+1YVhVY=
-icgY8lfKy+o7vYb3YgjddwVeznvoamkjBiNf+1YVhVY=
+BIsR7PAOZaATkQWg0KzUEwVeznvoamkjBiNf+1YVhVY=
 T9IYu8m+l988Xdo2GarTxoh2rvPoq4ANqhMv2Ou59Rw=
 vjxj8kegtXi2mkwH4BxJz2kOmMORM/tkBiNf+1YVhVY=
 8hOYBSoW2rz4wYvOFB9wBMF2BlskvCV1tVS5dZ9BXyE=

+ 2 - 3
nlp/src/main/resources/push-tc.dict

@@ -849,10 +849,9 @@ nzPGoyyforIipk8PLtejXkW9D+zeIUraO8B+JsbxdH8=
 nzPGoyyforIbkV8Wtt5rroh2rvPoq4ANqhMv2Ou59Rw=
 nzPGoyyforK8Qj1KfA4bO4h2rvPoq4ANqhMv2Ou59Rw=
 rTy1TX1+elrtY311tuxJbwHT7ODxdEQEfMUil0gwm6Ye18Z3QmUz0g==
-icgY8lfKy+o7vYb3YgjddwVeznvoamkjBiNf+1YVhVY=
 icgY8lfKy+oiUKE6xiqaGwVeznvoamkjBiNf+1YVhVY=
 T9IYu8m+l988Xdo2GarTxoh2rvPoq4ANqhMv2Ou59Rw=
-BIsR7PAOZaBXpjffLvuUW0wBvWcj4Ww7rUh2he+KdNk=
+BIsR7PAOZaBXpjffLvuUW0wBvWcj4Ww7Ihpbi+GSC9Me18Z3QmUz0g==
 na3Rh7vOnQzHOvdJia6bA8jPdsjefYU+
 F/wdwwrSBqNUKTzJfTzWAcjPdsjefYU+
 iR9sFnDhQZWd8uoN4DzWfp6AuiQ2eenv/FRS7OcKkCw=
@@ -2507,7 +2506,7 @@ vYYyVObI7XvrQFVHiVBZAGuoHJI6qaKykSlT2wHlmBI=
 4uadpArGqCeTfPYG0/ANVxPyjsQk3zQBfkRC94tU/To=
 4uadpArGqCeyIagSJgb8cBPyjsQk3zQBfkRC94tU/To=
 4uadpArGqCfeoIvuUniQ8pOL/cdwjra6
-2s+Nci9wvweK3KXUbQsrtCv6f5Xex4IB
+2s+Nci9wvweKQE9q0AwMBV8KQmsJAL/q/FRS7OcKkCw=
 HeHtnS7MGDYdcjDnJ6POQEpgEZ36UZf7
 d7ksvB02K9annCJHiih2YZOL/cdwjra6
 d7ksvB02K9beKF7kMumJh2uoHJI6qaKykSlT2wHlmBI=

+ 44 - 45
nlp/src/main/resources/synonym.dict

@@ -9500,7 +9500,6 @@ REjvXl6Y2y98YrhsrPv5TxksyOBEscR38DmpxJoFuAA=
 KGysvaF3u3wTt49tjAy2LN4vOsaC5jpSbIIykZl32zYCD7YcDd5yMw==
 Be+JZVPiyMVKzNOiOBiGbtVFoYK+o6mf83K2UOsmBmXFRHUhRPyaZunFIv8eHYyw
 0aHdh0ngCF8Gl1cN9QOxouarxyvl5F0l96BBLGgW6qk=
-K/GMW/8vItTuNXGo2rb20b5mxlh+XDaghvoEpLdzNoo=
 gYnBC5qI1lyuFf8w1KgP9vglBoTlyF1mLBGkD98IytgbxceELtlbpenFIv8eHYyw
 /CIzubCbNzzwcAISwYvjpcxEHLCiD1FbIi1vPcrlwk7MRBywog9RW/wiM7mwmzc8dRoarN7guKo=
 O9e+kGZV8o5CLYn0iVRhINVgzYe/qFbiMmo1SylN5BU=
@@ -9557,7 +9556,6 @@ WwWBxOC2OLp58snWo/4AUHgh0qxubXkpefLJ1qP+AFChAF8TDjFgLQ==
 hK5uiQNYMut7d/MXNaUcDFPtifC4+ug896BBLGgW6qk=
 W+Y0SwEFQHiBy+caJ8PRNo4KlQ7dNI4AKrpNT2dNfUAKX+LFc+OsM3ng8+iPStHcezcX2dCj8yc=
 kur6Z3rnvP5AVLnL0y7AR04S3cmH0f2pHE3XUUrXSV4wZrCwNsVkJenFIv8eHYyw
-Y9A+gg9R2s1ushPSH9+/SL12P+XAtp0c2X8FAfYlq+w=
 ueWzwnpHs3YKx/tUJGuNAuLHeYmfiECECNnf467k9eTpxSL/Hh2MsA==
 WVJ7+vV+e/AQaLRAdyg3O20hgmAzXtzz7JhbdOiIzKnubtpUCNIkAUpgEZ36UZf7
 z16Gwbx8YdiBcpoev7vi17uJAxZ+VzmFB5w33YbFrG0=
@@ -9620,7 +9618,6 @@ hXAxFoSBJPHhXyx6HNLyRhJdhdn5Tg4C
 PnUtuWrPMZSjGNyaW3YBXxYtR6noyzL4Mmo1SylN5BU=
 zC/bIffd/q+Eyx5AvYpxfMwv2yH33f6vbrXacIa3SJShAF8TDjFgLQ==
 Pwacc4yn9IubHghofvZJSp8zxqMsn6KyG5FfFrbea66hAF8TDjFgLQ==
-ab7S4LKSKOlQ42fxB1lC8UOiFupMqpnNiLJo/2J0/bs=
 9K+PZ38Hd/2qqEi2tB3qmviX9Af0UQbaOtTXcXhNs8Rvfh9ns6qDx0pgEZ36UZf7
 G9493mmuOO/pSgcoVE4LbahvsPhn5Y+v3rnIAt7JuEZeol7KVv/8wcn6lc8459yI
 8w89pNweVPMg1MRzGbj5FBZIuV375VycoQnYZtL/Mis=
@@ -9667,12 +9664,10 @@ g99MO8FN1D6gaXRRrB2In5u2Il7sPSycehXXa+4Za/LDYqbH/8Uz/g==
 G9493mmuOO8sp8S1LEN0PRPOxd6P/PghVGomzB5ACobMRBywog9RW/wiM7mwmzc8dRoarN7guKo=
 b/WI/AkkF2jTjsb0Q1DH6Y6559g2NPb6xuCMtxTWHcNfQo+f1V42ZEpgEZ36UZf7
 5ZoSjErEXv78gyrRGMmvz+WaEoxKxF7+tq3Hi05v1IjF6RAFgZX2qunFIv8eHYyw
-Y9A+gg9R2s2TjxjZmvYOROe7G06LA7dRpJ3zGBG8Fz0=
 vOdj7YZ7mGJGfo7ebY5l83PBw+qEjITq
 9P80opfkm0nGXNkgSB0sk98oz+Lb9eF7b5tyCpiFmsTckhMBEgff8OnFIv8eHYyw
 sznBlA3nS+Z6H2RL/mRtOMnxHmZ0xlqrxyTN5k0LTp4=
 m77dxTVVhn7eu90tUwfuhkQc7pCBU9Qx0qDWLGpaLoaLJSe64rUc9+nFIv8eHYyw
-AX3Duro2QJ+E/pbB/Jm1/604TgZpNwc1kHp6lXvE8SqxDWcnRW1BHOnFIv8eHYyw
 dHzFCLqvwDO7iGFLMraBRamvaFxe2/C6hvoEpLdzNoo=
 aNMyGRnYU/MV0D3EX1rG59SWAlQ61gcvDIZ1mJgQs9lrnMWX/J5HRw==
 +lGTyXT9VeOrBvfIfLfA++nFIv8eHYyw
@@ -9842,7 +9837,6 @@ rnweHYZbqiLKhakr+gkrN3dpNn/X0gcbtgpvz4lxfibtp7Tp7KilEE/vyjoO9e9+5PBjIwVriMo=
 3mKz2GcRLLRwJKeixvOmm2CS0gaFfh1yfkYNfIiGw/bv38bupTUq7OnFIv8eHYyw
 MfpZ5926ns6hPBEj051TeHlV6W+9jEaYgvI+mjK3AsmKsP/LIcqxj+nFIv8eHYyw
 ssXIPfTGG4i0B4WN4bLwTR0Sl1qZ2sVBse4UJb5DAwquU3BBxwgnv0pgEZ36UZf7
-BIsR7PAOZaBXpjffLvuUW68sNlHmZRLkkX8KNkuN3ng=
 Be1T87t+ge5GxWTzyJfux1kV9q9zR+YX13vpJcpKOy7GAHi4yxQ+Cg==
 A+WGQeVn0/Ss40q8mjeruTl2g3L6OIlMiLJo/2J0/bs=
 LYpQ+vNUOQvsvE6g9Yp2ry2KUPrzVDkLWFxkJVy7GnChAF8TDjFgLQ==
@@ -9870,7 +9864,6 @@ B20iTPe8N0WflloDZF1DAuaMBXbLV5H/F+UhF6KTo0OhAF8TDjFgLQ==
 tlJewb2TOZel3IWnHHdxgQGHoMDX5oz+ykVrfp78Nb4=
 0ZUl3xnSgk+oFBfwQfZ8J0pEahDEcVGxHW+kGfg3SzHy9biJ+nKrTkg38ZZhdCjP
 0OS8yIohSYDPwBECuQH+rcz3HbjMb+HCL9fzoHzCR9Q9c1vN/axqQkpgEZ36UZf7
-dbb/nqpHFMpnL48hMv0/475mxlh+XDaghvoEpLdzNoo=
 8G1JVfLQ6Hzt9xiFgNpUdyrs+Az/kTYEJJrNBXao4DrCn7+seJFxGF9z211fGKmO
 qw6g84VSL3hs6OnA3S+bYjJqNUspTeQV
 w8cfPSfmxGd62mBOzDoTPKrWKUTI9fMlwWUia9l7dbc/lJel1B5LXmCIJmwkjEn6x9d8F4yUIYOhAF8TDjFgLQ==
@@ -10260,7 +10253,6 @@ LPGMwdWA4uc25INRSQ7yKoxD4njys3NuNuSDUUkO8iqhAF8TDjFgLQ==
 NWbBpHLyLytD0QKQ+89AGllWmsB6bpa3/G1005Gz3wv4WeF8fX0QeZKZnPTLnrRMKR3h9NQJZac=
 A30+fw76qNk5mE9al3V7gp0furFVDHkPVU7f1d9ZUfDK74w7ob1wbpjrtK/AQGvhXPJyaPC+sBquU3BBxwgnv0pgEZ36UZf7
 YYhshDyRvu41eplnJ4V/Ebw12BWow3Cdyn5JOjAS51a4t0KLpp73Hg==
-5J7l7YfbjZWLvHA9/8rD0gqJefcNZxjF6cUi/x4djLA=
 9obp3ii+9gUYrauEDnQYOeF0W6nN9c3o6UoHKFROC21ZVprAem6Wt8+/BySZCAMM
 30De5ua7YnzikgxjYQgkaGdmHQSyYLvvGV4zQTBRZNuhAF8TDjFgLQ==
 rSXXWPdN/QsFBos8SoyJp1hbUhIgTt9cYQEw326TWT6xGRurij99lN4GYfAP+E6MMmo1SylN5BU=
@@ -10279,7 +10271,6 @@ rh16PU/bLznKwSWbD40NL8LcNHoJsHl4E2KOYHK4ivg=
 W+Y0SwEFQHiBy+caJ8PRNkQD6HOwjN6pKrpNT2dNfUAKX+LFc+OsM3ng8+iPStHcezcX2dCj8yc=
 Be+JZVPiyMUKwAh5ZpiUdIlmQ4WlIsCDwa9no5ZNhfNRT9YLuMAXVg==
 na7zpeyFx30wWU6jaieZ+LFZpTBx8qcmyib0DFlydx+ReBlgIuD3PQ==
-7h6CCA8K9Fm+kixR7qTuEO83Gej46kX9Dts8tg7LPIKhAF8TDjFgLQ==
 gywMijxUj6foRsUSWEeXSrsfZbE2TFcHV0oW9dXI8uw=
 Qj0Y3WPx8KxqT7t7iJuzTJkHFNsI7EPxkSw4GVsZKvc=
 oOpib5u9j6qP2ntP6PBYLh6YC2wn3ucaMPc2jJuNIFS4t0KLpp73Hg==
@@ -10550,7 +10541,6 @@ zVwyXyvT4lt01+Q+/gsZzc60+pAUx/J1HfWINvCPPOztp7Tp7KilEE/vyjoO9e9+5PBjIwVriMo=
 wHdVKtnxXb9pbA56Gh2pcyIgtpP2ddxLO3P/Re+8V1gQL9Rd7wwarA==
 8w89pNweVPMEubj/1VgvgsH6Jk3uyles6iaKcOpi28ihAF8TDjFgLQ==
 krrruYgapLXZllAv/2HVX2VP2DxGMTYuKPmBdt27nR8PtQXf9s80Zw==
-I1aIa6hm8PAhMCOBFxnvDL5mxlh+XDaghvoEpLdzNoo=
 jipC1ymKQpRpHfi2WrKKBsXpEAWBlfaqPDTjMPMLXuwHXev0j8hLaqKel/liE6VW
 Hs0NLY1uuN9HhnDutpgIbQ+JmD6fSSmxpieKgPA99jWaRaYXibbtbw==
 q/A04etya+jQXN8IW9c/4boh22fMO6tivfhCEIW04UihAF8TDjFgLQ==
@@ -10629,7 +10619,6 @@ rxX2yYO+MOPx7GSXVr0T1nQCGk/caM2LmWzdEzzkqcDh2q0utX5F8c+/BySZCAMM
 W+Y0SwEFQHiBy+caJ8PRNo4KlQ7dNI4ADfZz3kn3SuMSxsCvoOrtG3Y2IwsZkHI3pZR+24hIoq+03EVjzF6ChA==
 cjkjzsrWdAn2RjPkciH4Kn6PTEAg+oc+sZza2hPoi+I=
 dRfXOtKfzzL9LshgR6+LMcn6lc8459yI
-y7obEWNuRnFushPSH9+/SL12P+XAtp0c2X8FAfYlq+w=
 Hs0NLY1uuN+QNHLe1roolg+JmD6fSSmx9Y0kzllTDxcFwKGmzazTAQ==
 koyqxJA/NmrVUvUCcM9bTDXdZTJKOXR6Mmo1SylN5BU=
 huML/c8cqstc7YcDoqIb9fZbAaI5jCtsa9gPdPzwDr+hAF8TDjFgLQ==
@@ -10734,7 +10723,6 @@ uFg/Yxg9PLIqAOoyJRKzNNfmCM69+1qR7iAp+OLPslEudH5C46N+nUpgEZ36UZf7
 xFotwv9QCRdJ03CaLUlm60mJji07HX6V2X8FAfYlq+w=
 W7VwG1eOp7VX6+jq++Ubz7lj7VHyETZoMmo1SylN5BU=
 gkiddzfrq2mvio8IH69mTNCK6k3xfcqBUbwws+hN2gShAF8TDjFgLQ==
-y7obEWNuRnGTjxjZmvYOROe7G06LA7dRpJ3zGBG8Fz0=
 eeUehxrF4HUtdSEJeQpKz71jyPGXxRSuMmo1SylN5BU=
 eFhYVPfX+7dw0mETqn25yal1sGOsCj7yMmo1SylN5BU=
 G9+rVzl7Nku8HsuuFlPbRhA8hY6XRYNXzYPw5RuBmc+xP9eapsqB30pgEZ36UZf7
@@ -10768,7 +10756,6 @@ FdiMfCuy8st6kF2APNtsNrY6JXjKNk88Il+SAYKIpXY=
 sLtOhy76moLqLN3zrEQ3Gn+nkTEclJRN+DnSDA4FUjlxC5vpkSPrzA==
 rmaVfJ+riZNlPawMYztNFcWGUxwoMOU4l8F3VsQbG8I=
 V0FOOQRXeAmTAlNxWBq/hLjQVTQCLhr7ezcX2dCj8yc=
-QRCGdQzPmuxHe+PN03uUu6/uwTLnm0IjMmo1SylN5BU=
 fFXHrJ9hoKtDR4fXyxnMxMB3VSrZ8V2/aWwOehodqXOhAF8TDjFgLQ==
 Be+JZVPiyMVTanWtJ4CtBQpXhv0e0dBj0VVavU5LhiOB+vXsjAJiNmW9EbF8rPlO8FXivOjwUn8=
 m99YaX4miSwjAs+T2gxrshgYG0KsznjX
@@ -11508,7 +11495,6 @@ UlIz4dzbI0mQTy6jYpBdvA2QMHT7u+Ukuuw0Cza4wiMp9/732yGYFSzFAmoTjGse
 Yuke4RE3rqpxNEQ1yn+sCaMPYUJVRKDsqPyS8TTOfCc=
 fi/CmVlOFNHTeoP8ePjUggJGbiVFUuchRTDpGoCH2TX0XnFM5HyKxw==
 nIfQeCjqr0Hyi8qppPnQGFVHGp9wNiqy56WLVkaOS8Kfo1BHevXfghOeFx6BHdZK
-9zQvJoiFvkPiAP59prBv7CkbL/x3mdcYE54XHoEd1ko=
 b/+IyYhGw/LRMroyt2cKaKj8kvE0znwn
 G95wa9sArW26clVlVolcbgsc/cBMLApMunJVZVaJXG58gWSmJPHaeAX+MvSw6VTr
 j23SOqJWTVIDoG2oA8uCYFPloDSiWDqtDZ2NBukjaw1KGBWYGEtQ5B48ZIg141WM
@@ -11867,7 +11853,6 @@ HWLb/nfuHAkXN++XnKbdOL8wtEPqr57TrGQATwB51ROZTKzcPV80zyjtt8kDwGzVpd0AHrS1v6z0XnFM
 wOZQ6MS7n46JOr0UHoLg9KRckSU+xHvn4M23yaaP9P+OOhS+8uS+FaZnYxq166gnxaSNuTr7oN4=
 JkCHzIAcczjdh84S6Ye8F1fG+uztfBiGti/UAu+UcpbFpI25Ovug3g==
 eBN5Sh9iKEItii2D3AJ5K50G1vgP3ShwSGjVpnGzxp4sMxUjIJnv3loMD6M4BQBXE54XHoEd1ko=
-mrDTHVJw+WyHevKQGVhuI6Acv/e+2z3N1a2Yh9rYe0ZGyYVXqyuImg==
 dkXnJkUBwhsHj3/nZXl/Irkx1PudU7BDBgGBTuyx+yJTfw6q5kf/qKj8kvE0znwn
 nOyWg0Q/BZM0e4vEpL05X+Gs8a4E96mU7PeJdXDivSi4gPSSAVf241vegPmS/4f0
 i3t4huVoom5MUQ/N92H1XiF262HUKCvTVGM14gpzm9dZzdsz8stLEIfVI12UykZd9sH9CNVjvqHTp9h3mfHh7z/Oro/tF+OAk84XjcDJNomNnFYubwxejQ==
@@ -12346,7 +12331,6 @@ uWYYc3QGf8Yz0BU+n5koc11LmSec0A7pAOCJDicBprDBaBEVPbfS/dj3wFGgU/3oSmARnfpRl/s=
 bShzUBOuoNjnKdSTWrkf9PfzaUQNNfAr+gMAz6mP/tU=
 9DAW1akaKLCcqhuNBvbJY4mc2nZ/4U+crfwHToQQWTQ=
 nGrhLtHt4aXK9oUq9CaPOVHlR2GjEL/U86TDD7WD7eq2L9QC75RylsWkjbk6+6De
-zTTCQzOGVNfiAP59prBv7EW4bbA+w6XFE54XHoEd1ko=
 j1gb53LKBBdtwHnO1a9M9fv9i1GrSTb2pkTNXG0JMaU0rCTjyJVzeUpgEZ36UZf7
 XTzgdAlDi2wFYcAiiZS97vthGdnkkocrBOSXrA0xKKjxerq1//HvTjSsJOPIlXN5SmARnfpRl/s=
 rZCDq6FFuUwZ0Pg0gWSIVyuM9cfSyIXgtuUNVoGGo38F/jL0sOlU6w==
@@ -14686,7 +14670,6 @@ o91tUHP+x1BAYG8g74PUd3kkdII2zc6jptehU17cFvMmtplFp7Q1f+nFIv8eHYyw
 joB4IcA83AXeVL3Y8TUDMsW+/IZAfBFYBswU0iWsuD1GbLkBmRr1wenFIv8eHYyw
 joB4IcA83AUZqEd8dmNglI6AeCHAPNwFqaiXW+ElKXcHk0OkM1abrw==
 o91tUHP+x1DH83O8dw8qaxskB6C3HT5p14Zqm68yjaI=
-hfwDUF9FZof1tYQyq62MWC+HfAxA9xrm0Gfgyi0jxbsVGmXVLqJ44EpgEZ36UZf7
 A2NZtJBzqAEnYOdCgx1dSTWMePWUCunL
 joB4IcA83AVR2TcxwNGnWmM6L/zfFQWsBswU0iWsuD2EZ08eXz0kUkpgEZ36UZf7
 EtIH85K4H5jqqEc0bZmcZdFmNnTf9933Mmo1SylN5BU=
@@ -14702,7 +14685,6 @@ GY0JkiOym3luEcotQ17HhiqzDrIXEdoH4Lzaxbg6wQgHk0OkM1abrw==
 h3/bHlHOnLGmivubIECR1sUy5Yz5nq0IaPUdQ4SW+yI=
 dHiJrsr8DsryiH2sVtn1unR4ia7K/A7K81Hg+rZDHlq4t0KLpp73Hg==
 aQGS0Wm/xx5B1+NFbKNAxnHQ8ngbOBvypXtV/NI3Y7HaaSn2wvDdfTOMmpdCnlHJMmo1SylN5BU=
-oBu5zVSHPPK+ieajHaVCwZdJWy50DpKU0Gfgyi0jxbsVGmXVLqJ44EpgEZ36UZf7
 FIE0JiVOEyBzVlvQjP4HrqZbmbAO4leIH3NQkf67bsJ8BbwFVa7tlrfGWQ5T8Z3CMmo1SylN5BU=
 /MbiANYX5qm60R+YF4FJEjPikwcUPirX3vwvWbOvgZhbslF29wS2wjJqNUspTeQV
 iVGBwKo+BF1xxp2rruD9of4HLvRouT/D2FyZ+WvEg8c9zgZyGaOML+nFIv8eHYyw
@@ -14758,10 +14740,8 @@ TslpbpuLaSX2Kp6i8gWNPKJwahUluH5i+af0h3CUqEU=
 /MbiANYX5qnzUeD6tkMeWnIyXy8CTwsWJiM/9LjWAyDyTQNY8ap9mEpgEZ36UZf7
 KgmO1PFbNMbYXJn5a8SDxz3OBnIZo4wv2nrbKwCxyskeGoym70ikrUBraudQuzAWMmo1SylN5BU=
 LnTPXBJS+l+eKpuD11H1Ci50z1wSUvpfyhbgE3HK8dJYoR1jyqjJYA==
-hfwDUF9FZof1tYQyq62MWCkcbMh+rLoSc1Zb0Iz+B64Ye/xfIZV0tQ==
 tWHS5KqtmJGMloBT0HgqNgPkaY0mOKTsFHl2pvNB7Pc=
 KgmO1PFbNMbYXJn5a8SDx2FNIIKr4zAu2nrbKwCxyskeGoym70ikrUBraudQuzAWMmo1SylN5BU=
-hfwDUF9FZoct4p+V3y8zb3SbkTag86RD0Gfgyi0jxbsVGmXVLqJ44EpgEZ36UZf7
 2xIoI5/N53wLvPH99hxT1NsSKCOfzed8BmPEJ17uUzU=
 dHiJrsr8DsrHQpqlKMOY8TPAg3JeaMlmvfhCEIW04UihAF8TDjFgLQ==
 3lYEJRmTL064NM9RBS/F8GB0m+b7KVozWI1FaJ1MHjas5TrwcD3uuunFIv8eHYyw
@@ -14792,7 +14772,6 @@ joB4IcA83AWQemD/yXXmGo6AeCHAPNwFBJk5pSxkNhtLa2NTbbpALw==
 UB+LQ9hfFUTSObAJYaP5xMymgD+WJrKU/GDAg4fbOMZn4LeFwmx7XUpgEZ36UZf7
 hfwDUF9FZoct4p+V3y8zb67YVOs3vg6U0Gfgyi0jxbvxU7UXjz021enFIv8eHYyw
 fOrTNgGFmiYidTh2jSnHkFVAIuJevvLN7sZ/tSryHVShAF8TDjFgLQ==
-oBu5zVSHPPL1tYQyq62MWBdtqwtUr2qR0Gfgyi0jxbsVGmXVLqJ44EpgEZ36UZf7
 ryRne62lVqAZ0fx3g7JtUf+fULojQsMNc61vtTUVx72rYb+6kLRdnzwvtTkF7aEoMmo1SylN5BU=
 v2MovCXU7qAafUCrkfHCGkKOQULpYX4Km9mNFxixf94mtplFp7Q1f+nFIv8eHYyw
 0AdVDaMYXNbMouZYrZzOxa3/7G3mbJC96LmZzTlwnfGIU0YvXy+Y1omtHMM12q1O
@@ -14827,7 +14806,6 @@ LnTPXBJS+l9zVlvQjP4Hrly5AOILRUzZYcMKkkNQaqB8BbwFVa7tlrfGWQ5T8Z3CMmo1SylN5BU=
 0QUL4nFKgdd0fxDSyppfdtEFC+JxSoHX3xtT0BbKreVyn2NC1Wlksg==
 tuoczNg6Ji0KsqVBON1zjAalqXeFIYyKCrKlQTjdc4z9g6kGygCaog==
 2AYFtme6h2juxn+1KvIdVBteHRHiz62uqqq4KbUmAcQ=
-oBu5zVSHPPL1tYQyq62MWC+HfAxA9xrm0Gfgyi0jxbsVGmXVLqJ44EpgEZ36UZf7
 2AYFtme6h2jU3oGGwHP7d6JwahUluH5i+af0h3CUqEU=
 UlEWhbOQ0DrsvE6g9Yp2r1JRFoWzkNA6leib30PTnaKhAF8TDjFgLQ==
 joB4IcA83AW4NM9RBS/F8Lz910KCNs/lnPYMGp5qXZqs5TrwcD3uuunFIv8eHYyw
@@ -14847,7 +14825,6 @@ QoDu3HV1C6oiDs73A/X5CHUPQmXfOVZDe499uOGXiFw=
 joB4IcA83AUIcu37SFs/7TUpRdnv6U+6BswU0iWsuD2EZ08eXz0kUkpgEZ36UZf7
 3lYEJRmTL04thjNH6AVcc9k52gf998k1rijA7xoh9bVk8oflKrwUK+nFIv8eHYyw
 ERwzEHJFSaQ+rvZ6g7z1lvdq3SLkut3dl/wCFMKOuMc=
-hfwDUF9FZoe+ieajHaVCwZdJWy50DpKU0Gfgyi0jxbsVGmXVLqJ44EpgEZ36UZf7
 TslpbpuLaSVu1fKwtGyqvqJwahUluH5i+af0h3CUqEU=
 wxSr1LqU3fFpG8sypRewasMUq9S6lN3xLBfnRt1OTDShAF8TDjFgLQ==
 3lYEJRmTL04Icu37SFs/7Yno+6bFXy6SBswU0iWsuD2EZ08eXz0kUkpgEZ36UZf7
@@ -14859,7 +14836,6 @@ UB+LQ9hfFUQafUCrkfHCGgPZ56Ayjq7WMluBdjtgB+JmQ9QdIS7A4w==
 ryRne62lVqDSxe1N37Wd/ycaeYbUCuzXrijA7xoh9bVk8oflKrwUK+nFIv8eHYyw
 bAqw2jgHq3nskSIcuTh4KvgAsMLgk53jxuCMtxTWHcNfQo+f1V42ZEpgEZ36UZf7
 aQGS0Wm/xx786mcFGLd/Epb38KOuvDnPAnL9mZxrKVKe5/M0fvOjzEpgEZ36UZf7
-hfwDUF9FZof1tYQyq62MWBdtqwtUr2qR0Gfgyi0jxbsVGmXVLqJ44EpgEZ36UZf7
 d4zZmm/dT+ShRauPglwm2gIJLH+D7F19KblFbHVVHs2hAF8TDjFgLQ==
 1cg7mRlV5xObUumNOZBvZ9XIO5kZVecTW7k4wPhAGm9mQ9QdIS7A4w==
 ryRne62lVqCbUumNOZBvZ68kZ3utpVagW7k4wPhAGm9mQ9QdIS7A4w==
@@ -14876,7 +14852,6 @@ o91tUHP+x1CdBPthNaYW181Gpun3m+QlezcX2dCj8yc=
 5lwi71uqrz24RJmuIdRjcRhFk3kbE4rwA62BG2lyLegncAFARp5+Uvito6y09zTLU3nXbm1Y8XQ=
 0QUL4nFKgdfG4Iy3FNYdw/OedIJ/Qe57pSwfIuFo8tsmPsRkwtBOR9zc2dRzh2hL
 joB4IcA83AXSxe1N37Wd/yShb6zTGZRxrijA7xoh9bVk8oflKrwUK+nFIv8eHYyw
-oBu5zVSHPPIt4p+V3y8zb3SbkTag86RD0Gfgyi0jxbsVGmXVLqJ44EpgEZ36UZf7
 d3pIPoWc+5DMGoS7rVMMIMPq5W92LKv0BTMSGRilQLOoY5THPzs7+qVaVePy5OzR+HQAhymyN3I=
 joB4IcA83AXt15lYliJU8o6AeCHAPNwFBJk5pSxkNhtLa2NTbbpALw==
 ryRne62lVqAthjNH6AVccycaeYbUCuzXrijA7xoh9bVk8oflKrwUK+nFIv8eHYyw
@@ -15088,7 +15063,6 @@ joB4IcA83AUgfR7Mw9ntjr8LeKWpgSGtXBpMaGXzVaKe5/M0fvOjzEpgEZ36UZf7
 ryRne62lVqDt15lYliJU8q8kZ3utpVagBJk5pSxkNhtLa2NTbbpALw==
 rQa6GRP8MlJ1H7Ix9ImhBRcKBBZT/ZUTNwNeiWbL9vfzCXvTZrI4NUpgEZ36UZf7
 o91tUHP+x1CEH+3RtGMKf8qSs6Ql7970/GDAg4fbOMZn4LeFwmx7XUpgEZ36UZf7
-oBu5zVSHPPL1tYQyq62MWCkcbMh+rLoSc1Zb0Iz+B64Ye/xfIZV0tQ==
 v2MovCXU7qDSObAJYaP5xMymgD+WJrKUidUO7flLrAKeHdqy/SsZ64mtHMM12q1O
 3lYEJRmTL04gfR7Mw9ntjr6TG20jsIZRXBpMaGXzVaKe5/M0fvOjzEpgEZ36UZf7
 ryRne62lVqAgfR7Mw9ntjrq7FKDxwpwJXBpMaGXzVaKe5/M0fvOjzEpgEZ36UZf7
@@ -15339,18 +15313,6 @@ sgHBu+uc7x/Vpqs/KsEUljJpzjac6o+W6I0Xtc7YrJ02pJsJ5QNsGw==
 w+z+5GU1NasmAInNKaly5D7HJD9UZYyxun6XLNQDSjlKYBGd+lGX+w==
 b8BRgFfPCXfcPOc8CcXzMqLnmPxwfK/bi95/qyZs/0kD3pOHGkjxe/zOEZelC+pG
 naO1PUZXd1Uzy+9V/qT8imeMK21vSbJaWSb12fdO4ecFjxj2hmKc6uvOvL8iVbTfoqh/BsODLTo=
-kDiWMe1LBSm1s3nsuAR75fhW+1QT3d+NILN7w79DYIK356p8kcum4g==
-lMQviqXXaosjMqR4hRGPILeA2ahBkMumXz7qAxpjREU=
-kDiWMe1LBSmK/DifJdlRy/hW+1QT3d+NILN7w79DYIK356p8kcum4g==
-8hOYBSoW2ryux2Jp+WDa17eA2ahBkMumXz7qAxpjREU=
-kDiWMe1LBSlbXulNiRdgUDdaPfKNgkk4LNFey62K/JqcqrSpCMVeBEpgEZ36UZf7
-DAK5U1M2dYCx4d4AdqNmYJA4ljHtSwUplKN/5W6VHFmhAF8TDjFgLQ==
-cjkjzsrWdAmzcwIE7hrbXbeA2ahBkMumXz7qAxpjREU=
-lWOwJgBfjB1AhhhwJk5v1rJmeK01UUOzMDQlGC7cQ8V5i9OSwjFCSlLytNMe7aN24oXwdDGRXLS8DRZQ6mx3/w==
-W7ELXUeBox+6RVs9Hb4bUX5Vi9mMqP6OsZza2hPoi+I=
-kDiWMe1LBSlCr8+E6OcH9muvceMj7SX7ILN7w79DYIK356p8kcum4g==
-8hOYBSoW2ryMPt0nQIssDreA2ahBkMumXz7qAxpjREU=
-kDiWMe1LBSl8pDgZ9Qwy/vh7VcJmWM3VILN7w79DYIK356p8kcum4g==
 AIvTjMd3sKt0fZIcI48/laW4hZoppV4TSmARnfpRl/s=
 Rd0lMhapus9841qlXVGmBDHm40R9ztCAqBKsIcb+p4w=
 L1w+cQvCSoR3kuGNAS4JvC5Ml0Kt0ht2
@@ -15401,9 +15363,6 @@ CvqGCxMnE5hXemvATqpTTamc5mGscdNuzP85B2tcLmsNW9NJfk9cWXVqxiPPiYFO
 BNA1+QWM64uGWL3lIgMLuCRFW1dgFhuWHD9Ie4feQOhpb/c9CGc9Hg==
 L52hp1f2VDUgUKOUnersjb+tleXYt72z
 ng+WEW3YSTnVPcpAZr06gFPQ2OCuXXMbGmfIX2Q4J/mhAF8TDjFgLQ==
-y7obEWNuRnGvQN+lqBGdtil2I/uDW8U9y9ZWsJSAv2I=
-Y9A+gg9R2s2vQN+lqBGdtil2I/uDW8U9y9ZWsJSAv2I=
-pwmigjcr+PE8iyvbxERsE+JYkvsAd/g0Mmo1SylN5BU=
 JOiiDzZcmrb7D22Z3J3901+jDoVJxQAW6qMJmS5C0DE=
 4buHisn8MDDg9McQH8FUoxnSRLkNBrWCOo07KsYM1BqsXqmeFxCWBCb/KxfYdxS6
 uooYmkZ3tky82j8JYvRvit/G4KeoebbzzeOAh7h7uVyOdGuy3aHq/g==
@@ -15527,10 +15486,6 @@ Be1T87t+ge5XlrymvmHctt6Wz814M8o/2gEkv6rb+yt/fmHP/od+AgfZT1LxzkHh9F5xTOR8isc=
 Be1T87t+ge6hSeRb7Ag6sw0cBJfWQcUkZOkTbXR1ge3seOyBIXHkRi6S9f+68mUiSmARnfpRl/s=
 Be1T87t+ge5XlrymvmHctp182uNFZmoMGfmCXrxCKlRAW+5jnBcPMWEPms/NpQJU
 Be1T87t+ge7fRsD5o5l9tIasCxaGe58aGfmCXrxCKlRAW+5jnBcPMWEPms/NpQJU
-ueSRAPp/gnVOuo9JIYGE2i36w0QrB4hFeXsrfyKOaJ4FABpLgG6E+me4WwU+kwb1VRZTPWgm/GE=
-jnKM5RvMFMa9RePhaoclSK4R7ARCoVP6Fx/QQiQeDi0tXqr0K5lt6awURzhkBNIdFEZfp0P7Jv017ljPNlOc6lVkroyz7wzn3V4Ed1DhG8l0qN7cQ7igrQ==
-BcZgUG0BBCzdyG5IBGPLyLJ1qxPqyfhLklh8SRWTGXVR5/JvesMag1IuhQOhY1FVHOT2x6a3E44=
-jnKM5RvMFMa9RePhaoclSK4R7ARCoVP6Fx/QQiQeDi0tXqr0K5lt6ZR06pZQxzjodSC8XqoCh+WHk3hLYiLjw9q19Pr2qwO8G/XYjscJCC0X55KUqlyd2w==
 xhWftWtq9Ztmxyed4pGTIdYhDYnVXGZFG0rBPY7xg6QKPvcER9ZRqib/KxfYdxS6
 B5DO9dw1D2YdCxeUgyevhTjX3Wd83Up71S5qdUgnkTppb/c9CGc9Hg==
 B5DO9dw1D2Zvgkz8bZaH9AeQzvXcNQ9m4v61w4s7fOw=
@@ -17120,3 +17075,47 @@ bORvZe7L22eQisCY7Zuh0pZ22d4v39chKz88Jz3rfxwJyFyROm+o6kpgEZ36UZf7
 HM89DEXwIpbNR2sokIykjIzSI+cbaBLCA9Zx+nCnb/qhAF8TDjFgLQ==
 VIecTxZX0ZZCFGckIRfCZoCe63E/36NvVPPA5fCmEZuecSnvKnTFzLGMdNh6Wz/l+HQAhymyN3I=
 2bZ7YIU0fmywGZHybODLtrc8SEsfHlWFX4Q6YOM86Kg=
+ueSRAPp/gnVOuo9JIYGE2i36w0QrB4hFeXsrfyKOaJ4FABpLgG6E+me4WwU+kwb1VRZTPWgm/GE=
+jnKM5RvMFMa9RePhaoclSK4R7ARCoVP6Fx/QQiQeDi0tXqr0K5lt6awURzhkBNIdFEZfp0P7Jv017ljPNlOc6lVkroyz7wzn3V4Ed1DhG8l0qN7cQ7igrQ==
+BcZgUG0BBCzdyG5IBGPLyLJ1qxPqyfhLklh8SRWTGXVR5/JvesMag1IuhQOhY1FVHOT2x6a3E44=
+jnKM5RvMFMa9RePhaoclSK4R7ARCoVP6Fx/QQiQeDi0tXqr0K5lt6ZR06pZQxzjodSC8XqoCh+WHk3hLYiLjw9q19Pr2qwO8G/XYjscJCC0X55KUqlyd2w==
+jnKM5RvMFMa9RePhaoclSK4R7ARCoVP6Fx/QQiQeDi2Wvxl9/4lcbHUgvF6qAoflh5N4S2Ii48PatfT69qsDvBv12I7HCQgtF+eSlKpcnds=
+0kUke9uRIldhZIwHIXvVmIHuv3FPAcN/f7jb5SdsT6eafcJixa0rLFPvvfFCucap
+ozTlDIiUMGScAG/25jWT7M+L/v4HAV3B
+9zQvJoiFvkPiAP59prBv7CkbL/x3mdcYE54XHoEd1ko=
+ozTlDIiUMGScAG/25jWT7Kj8kvE0znwn
+sUhsea0LcOv5F7p2khUlbZ8MMhLf/fHGAlAVHMx/Wtle6e7r3rUaJBNluJJW2HnTVFE9b8ZRwIPD546/SW4MvhOeFx6BHdZK
+0TNWMcYwWT2uOOeQl1oeic+L/v4HAV3B
+mrDTHVJw+WyHevKQGVhuI6Acv/e+2z3N1a2Yh9rYe0ZGyYVXqyuImg==
+zTTCQzOGVNfiAP59prBv7EW4bbA+w6XFE54XHoEd1ko=
+0TNWMcYwWT2uOOeQl1oeiaj8kvE0znwn
+kDiWMe1LBSm1s3nsuAR75fhW+1QT3d+NILN7w79DYIK356p8kcum4g==
+lMQviqXXaosjMqR4hRGPILeA2ahBkMumXz7qAxpjREU=
+kDiWMe1LBSmK/DifJdlRy/hW+1QT3d+NILN7w79DYIK356p8kcum4g==
+8hOYBSoW2ryux2Jp+WDa17eA2ahBkMumXz7qAxpjREU=
+kDiWMe1LBSlbXulNiRdgUDdaPfKNgkk4LNFey62K/JqcqrSpCMVeBEpgEZ36UZf7
+DAK5U1M2dYCx4d4AdqNmYJA4ljHtSwUplKN/5W6VHFmhAF8TDjFgLQ==
+cjkjzsrWdAmzcwIE7hrbXbeA2ahBkMumXz7qAxpjREU=
+W7ELXUeBox+6RVs9Hb4bUX5Vi9mMqP6OsZza2hPoi+I=
+kDiWMe1LBSlCr8+E6OcH9muvceMj7SX7ILN7w79DYIK356p8kcum4g==
+8hOYBSoW2ryMPt0nQIssDreA2ahBkMumXz7qAxpjREU=
+kDiWMe1LBSl8pDgZ9Qwy/vh7VcJmWM3VILN7w79DYIK356p8kcum4g==
+2s+Nci9wvweK3KXUbQsrtNrPjXIvcL8HWajxrUJ/4cAYe/xfIZV0tQ==
+UcvgigUAIm987OfXv8VpMdrPjXIvcL8HWajxrUJ/4cAYe/xfIZV0tQ==
+icgY8lfKy+p15NK0rIEgsA0iYvCtXRzHHfv+S/BQYFOhAF8TDjFgLQ==
+hfwDUF9FZof1tYQyq62MWC+HfAxA9xrm0Gfgyi0jxbuvWyztsFn23Ohz5F1sexC1
+oBu5zVSHPPK+ieajHaVCwZdJWy50DpKU0Gfgyi0jxbuvWyztsFn23Ohz5F1sexC1
+hfwDUF9FZof1tYQyq62MWCkcbMh+rLoSc1Zb0Iz+B65UTUElvjy+o+nFIv8eHYyw
+oBu5zVSHPPL1tYQyq62MWBdtqwtUr2qR0Gfgyi0jxbuvWyztsFn23Ohz5F1sexC1
+oBu5zVSHPPL1tYQyq62MWC+HfAxA9xrm0Gfgyi0jxbuvWyztsFn23Ohz5F1sexC1
+hfwDUF9FZoe+ieajHaVCwZdJWy50DpKU0Gfgyi0jxbuvWyztsFn23Ohz5F1sexC1
+hfwDUF9FZof1tYQyq62MWBdtqwtUr2qR0Gfgyi0jxbuvWyztsFn23Ohz5F1sexC1
+oBu5zVSHPPIt4p+V3y8zb3SbkTag86RD0Gfgyi0jxbuvWyztsFn23Ohz5F1sexC1
+oBu5zVSHPPL1tYQyq62MWCkcbMh+rLoSc1Zb0Iz+B65UTUElvjy+o+nFIv8eHYyw
+K/GMW/8vItTuNXGo2rb20b5mxlh+XDaghvoEpLdzNoo=
+5J7l7YfbjZWLvHA9/8rD0gqJefcNZxjF6cUi/x4djLA=
+I1aIa6hm8PAhMCOBFxnvDL5mxlh+XDaghvoEpLdzNoo=
+T3c4w4AtBnDuNXGo2rb20b5mxlh+XDaghvoEpLdzNoo=
+AX3Duro2QJ+E/pbB/Jm1/604TgZpNwc1kHp6lXvE8SqxDWcnRW1BHOnFIv8eHYyw
+pwmigjcr+PE8iyvbxERsE+JYkvsAd/g0Mmo1SylN5BU=
+QRCGdQzPmuxHe+PN03uUu6/uwTLnm0IjMmo1SylN5BU=

+ 18 - 15
nlp/src/main/resources/tc.dict

@@ -11233,7 +11233,7 @@ uEpW/q3tmt15qUwLqXq8bmCF2DSLTL8RSmARnfpRl/s=
 gwbZYA8s0RRXrXfAiVXysluYXByfIuuBSmARnfpRl/s=
 gwbZYA8s0RSu50FiM0A8RezCdArlDLY/SmARnfpRl/s=
 gwbZYA8s0RSPKztzbAJJcL8Pp1pL0iyHSmARnfpRl/s=
-dbb/nqpHFMo984BzxOspnyU6A5w2hjQlSmARnfpRl/s=
+dbb/nqpHFMo984BzxOspn6j9imFrfvUOSmARnfpRl/s=
 J4w+PC8luxJ1lyRoXJxgVrMlXGcNMSUx
 J4w+PC8luxLmbEgZFj0gmbMlXGcNMSUx
 XbP9aDkb1mUpnoq4laRA2Vi/cQNTrk7HSmARnfpRl/s=
@@ -68576,7 +68576,7 @@ iVGBwKo+BF3kgViGTtERpf8Xaffh1dwVSmARnfpRl/s=
 iVGBwKo+BF3skSIcuTh4Khh1mYkJipojAezH8qa0SD0=
 iVGBwKo+BF1xxp2rruD9ofMuE3t679MAAezH8qa0SD0=
 iVGBwKo+BF2ICEyuDI66K4r4ZDPYLsQmAezH8qa0SD0=
-hfwDUF9FZod87OfXv8VpMTzQSezQo2BT7FmRuz8aN/Z3bEBo9wF64Q==
+hfwDUF9FZod87OfXv8VpMdk2INpekIDj0KBxyUxIqQU=
 hfwDUF9FZof1tYQyq62MWF+jjki1BQUHmFHk5DjBXmlVFlM9aCb8YQ==
 hfwDUF9FZof1tYQyq62MWALvuGE5eCICOKsEeW8/Xfo=
 hfwDUF9FZof1tYQyq62MWDRmmtFkg03DmFHk5DjBXmlVFlM9aCb8YQ==
@@ -75899,16 +75899,13 @@ XNudhLdRFiqfNiwZW/RQAS6UEbmNl8pf
 XNudhLdRFiqqV5FGN+58c5gPmcOzCz34
 y7obEWNuRnEkPvhsKhcMR7HN8Xq/8BVlF7xejSxLmFo=
 y7obEWNuRnGfQim4e0rjPYSQBZUZqxis3oxz0qidJfs=
-y7obEWNuRnGvQN+lqBGdtgHBr3EUkisxlVLLipro+Es=
 y7obEWNuRnEZbHccOhpdeqW4QBhuHfeG
 y7obEWNuRnFtLfN2jHLOUqr1SDFQzIVvgqhYS2kgzy8=
 y7obEWNuRnFMdB8dWVQABEhCO9rRB5ckCiE3Co3PdzA=
-y7obEWNuRnFushPSH9+/SISQBZUZqxisIKBvhXh7AhQ=
 y7obEWNuRnHJ/UBg2bofax83fiZt/d1qQaGDaWeWPZg=
 y7obEWNuRnGL9/Ym3iqG2FuPSNykfeCs
 y7obEWNuRnGJWehhUlWE5+s3AKEnLkyab5r6+4IDnbM=
 y7obEWNuRnHVTEslqiVHOYSQBZUZqxisiYMokWhFugI=
-y7obEWNuRnGTjxjZmvYORISQBZUZqxisUpz57Luoc9Y=
 y7obEWNuRnH+OeccPPwf6pHp/Z85xTeZ
 y7obEWNuRnEzQ2PaDV3J1UGH92UMPWu3Xo6ktLAPjsU=
 y7obEWNuRnEvrT/EYLdyJd8+IINMxlmujNIoEBrDmsQ=
@@ -82696,7 +82693,7 @@ rTy1TX1+elq1HyRbILTl2oJkxv76crdcrU3iVCbGoxIgOSMVM4ii6w==
 cjkjzsrWdAlljWecuvrs3oJ3EnabmXZaRC+93hEa8GRa1sn+Ykgf3w==
 cjkjzsrWdAmW7E/DVfnTtLMfG6zmZyz/Ux8e5j+8xkDFpI25Ovug3g==
 cjkjzsrWdAkz2SWnnSwADjwr2ZxRjssXSmARnfpRl/s=
-icgY8lfKy+qLoxNw0KslCY7TQRArsXRXSmARnfpRl/s=
+icgY8lfKy+qLoxNw0KslCb4g/A+FPGuKSmARnfpRl/s=
 icgY8lfKy+pu+X3Ea90lyHYhcTFGY1D4
 icgY8lfKy+pjDmZBgjuEIZutiLpi290rSmARnfpRl/s=
 tp3GwclginGUE54FGk1mnI/MAJcoP8Z4nkV8Z/KQJTeuFGWJfY+tvPBjDc6YVozACdCUpQrDu9W+gEf5oBpHFA==
@@ -82721,7 +82718,6 @@ BIsR7PAOZaAF/KXhAJIEJ8ULH2UEPvCLKxHckYTQDZ3DiXS1BJhWDi4RjKauX+DeQ7uK+j/EoMc=
 lMQviqXXaouxyRFsWtXqcc5fRB3/HhrySmARnfpRl/s=
 SfN0rCTawJSaIg6ylE7iMptxdEIxNw7B
 lWOwJgBfjB0p32D/sR59leDf7LoT0iWkmWRggIpxtySia0min0kp8g==
-lWOwJgBfjB1AhhhwJk5v1rJmeK01UUOzMDQlGC7cQ8V5i9OSwjFCSnuJBpEj1xdDgmE9aYHmdU4=
 ZGSWGMVd0xoFj5Hk8a3gR5gbgHa2HggUSmARnfpRl/s=
 na3Rh7vOnQxP3Mh1X0psywEirY3QnQB6SmARnfpRl/s=
 hzM4yu0aSDACf/3+pmkgRniC2Mr0lEMfomtJop9JKfI=
@@ -83844,7 +83840,6 @@ liy2X+sq556+GdHmUIHnH1oamVOZ9QmzueFkacWcmC/DvjLjMHV27Q==
 JVRnf1TPJpG7J756eU0RziyrN35xm8Fe
 q2Ug5TBrlVW76GhjYLvASiLek0AMJUHg
 qI5PNncsLsrMVEfmiEO2dIUAjNTvpWbn
-cIt6jB68dzRmPN7YwJoWfPNEfYZG6BS9
 k/2JF/LOQLyvjN/d8siMZGlv9z0IZz0e
 QOuojJTcOMcWzwqhfYSqFCl78bgUEb9Sd9AOj7F+LeQ=
 Y3RnUcsJT4UnHOlkm0sxA9zTKDPvdlXAEQiZDSB5DJM=
@@ -119174,6 +119169,7 @@ cKOdVc8vfzhkzwqQVzMRyD3RDGJGoEmr
 sUhsea0LcOv5F7p2khUlbZ8MMhLf/fHGLG0rNgmVmCnzcXGFmKTzXtq5/F8KqpTJF5GTeMiOsAY=
 sUhsea0LcOv5F7p2khUlbZ8MMhLf/fHG0F1PLZyDADUlznnlpW+0zptDGoZaK2g1epUhLHcK2ON1B/yru+cfycWkjbk6+6De
 sUhsea0LcOv5F7p2khUlbZ8MMhLf/fHG0F1PLZyDADWxSGx5rQtw6/kXunaSFSVtnwwyEt/98cZSsQfex4JFZx3oZ0wwEf8/
+sUhsea0LcOv5F7p2khUlbZ8MMhLf/fHGAlAVHMx/Wtm5k7W5TVcCzvFF9yCZS55l
 4HP49R9UXag0HNXS5iHtDY302jg6jOJSwjnRyizh+1V0px60twFxKLPnKHcYye+SuBCu2tBVKl0=
 4O7Js3C0ww6LBtGMr15XOLR3J/V8/pvC5sspxpS5q4syajVLKU3kFQ==
 PQziXjMZ2ZeFrSLZfIiBE4v2vOwnvrlJ
@@ -120062,12 +120058,13 @@ nje2JJx5AaYlQ9tF2pPPaNYt4JtTMcs/
 0a2w7VVGSI3MQwxTT5KSeNJb+lBhtHH1SmARnfpRl/s=
 zvd3kTipqHAK2vHYhn4e6agFAl2rgd4V
 KFqkwA3f0gzWyJfxxa+YRWbwmC5XqF0XSmARnfpRl/s=
+I0o66/N3ALHzcXGFmKTzXpZoQTr4x8eEe6UZHAHq6Jw=
 C6nHm3j3ANrcJg5ZdRz8R9gocrvkcPUxOi8T2m60saAhVDMiGxC3+g==
 C6nHm3j3ANrcJg5ZdRz8R6j84BR+gHtaOR2wnlrmKvtv66t+03YqIw==
 O9jAeOgLIsPxfmhTExM8HkHT0B31boGh2vyS/AMFfMiy5Pa1k4tXpA==
 O9jAeOgLIsOsVlC+u0TA6j46ZwqV27wPUhB91YTicp8=
 O9jAeOgLIsNJm95TcY4FLYFTuTvVs9tRR6vzFVZVHE9KYBGd+lGX+w==
-oQXL0ktox9e4A0tBUOq4Y/1bbYvzpM+Y
+oQXL0ktox9ek7o9iRr8lak9XKpGeMK6aTCjIXRNEdWP1oWpDVbclmg==
 1/Ut3AF5bQTcJg5ZdRz8R9gocrvkcPUxhE1Fe757qit4LMmQaBBhYA==
 1/Ut3AF5bQTcJg5ZdRz8R9NaV7tn0/sNOR2wnlrmKvs+ypcrqT2PRQ==
 jEBWKyp+ziHxfmhTExM8HhUDJsg9OA9k7+Qq285nRk0c5PbHprcTjg==
@@ -124879,16 +124876,13 @@ I7OT6a7asDVizRTzKIkAOfkixcEqdSeFLuFTPl8rMzg=
 Y9A+gg9R2s3g3r3KJfPFAU4AUh9ULLvpSmARnfpRl/s=
 Y9A+gg9R2s0kPvhsKhcMRyCOV5Lzk7d5F7xejSxLmFo=
 Y9A+gg9R2s2fQim4e0rjPYSQBZUZqxis3oxz0qidJfs=
-Y9A+gg9R2s2vQN+lqBGdtgHBr3EUkisxlVLLipro+Es=
 Y9A+gg9R2s0ZbHccOhpdevIRcD9L+Fi8
 Y9A+gg9R2s1tLfN2jHLOUuwYYUKYTBZNvoBGoV6FD/o=
 Y9A+gg9R2s1MdB8dWVQABEhCO9rRB5ck1IIK3t0WYQI=
-Y9A+gg9R2s1ushPSH9+/SISQBZUZqxisIKBvhXh7AhQ=
 Y9A+gg9R2s3J/UBg2bofayWo7meMipWztcKJV8iWeyQ=
 Y9A+gg9R2s2L9/Ym3iqG2MCTbqBionOA
 Y9A+gg9R2s2JWehhUlWE5+s3AKEnLkyab5r6+4IDnbM=
 Y9A+gg9R2s3VTEslqiVHOYSQBZUZqxisiYMokWhFugI=
-Y9A+gg9R2s2TjxjZmvYORISQBZUZqxisUpz57Luoc9Y=
 Y9A+gg9R2s1Os4Fc7znnT5Yz/GXo1yoWmyR6yre6EBw=
 Y9A+gg9R2s3aA8/lWV2P6/j7QEdNHHiV
 Y9A+gg9R2s3+OeccPPwf6kADxuVDVJxE
@@ -152513,6 +152507,7 @@ jnKM5RvMFMZMLAziUPgDXx+oLOZ5Uynj2Fjo8+rjjk6AaIQejMduZZDrCiknhEiQ
 jnKM5RvMFMZAEaaEYk8F7Ff2ro5Mte6ghk2vfJV+qGr+N4No84ScFg==
 jnKM5RvMFMbJeobq5U8j+3S9sRyjdjzKt0OQ82pn1pYQM2dnqFlPog==
 jnKM5RvMFMZLYKh9EgcY1glPatznB48TVeKToIKzF5CvionE6D/E/UpgEZ36UZf7
+jnKM5RvMFMa9RePhaoclSK4R7ARCoVP6Fx/QQiQeDi18Y+rL0b3WoVy2dj6Wd4Eh
 jnKM5RvMFMa9RePhaoclSK4R7ARCoVP6Fx/QQiQeDi0tXqr0K5lt6fOpNJAvrZ3xi/dBl77C4yo=
 jnKM5RvMFMa9RePhaoclSK4R7ARCoVP6Fx/QQiQeDi0tXqr0K5lt6XhmJWxsVRWfXLZ2PpZ3gSE=
 jnKM5RvMFMa9RePhaoclSK4R7ARCoVP6Fx/QQiQeDi0tXqr0K5lt6edNo4BcEstCCmuSGR/eYZ8ihxz4/zbYOA==
@@ -152552,6 +152547,7 @@ uApZZNNFMDzpKSPeEZhRGIbmCKOLhHiD1AsCZbl1iHcRXn8Qm8HaSg==
 uApZZNNFMDwZZwXBimQUaHeUoGexooGhSmARnfpRl/s=
 StSRvnYPuXTQx1QvTEMtqTS1UNZUXq0bqQ6APx5mYEmia0min0kp8g==
 StSRvnYPuXT40now7GPpczntepkvRFy2D6dZfA/HdtX/BIiz2f1ytnFHe4WtzzwD
+0kUke9uRIldhZIwHIXvVmIHuv3FPAcN/86k0kC+tnfEw2oXCrdqVug==
 VE+J18YU5EwHWIAB/A/lDABlpOc/vLYzHj8Jw0QS0Sk=
 VE+J18YU5EwHWIAB/A/lDMk+O51n7KSbUcO9A+QgXv4Il3ek4lC35NG3a7A14p5oqMW44hWA0i0=
 VE+J18YU5EwHWIAB/A/lDFYTsyw0VJlF1NSGTmXRCBvoD3szXSNDmClfMY6KTI9o
@@ -235338,7 +235334,7 @@ sxzKNsuQB4frYdCCdna489CyrhE5VdRY
 U5hIalRI2f8bEh/SFBY11/Op+eFvP6HCSmARnfpRl/s=
 dEzYO2ndtqoSrXZDPuz9JGKtdbLzv33e
 EnOc8aU1hlGkSsBr9hu5R9kWfPEQ6zu1
-bvLuatSSAWqxBOPlvbmotEGsdOGgj/Hl
+bvLuatSSAWoR+jmkTIJ9Df1rt8UoytdE
 4PJa/8Np5NrrYdCCdna48wBHKl7pit1C
 bZ4LTB742kekSsBr9hu5R+r17gE6QBkY
 bZ4LTB742kd3qBPPkcZW2OFqdo95jlu8SmARnfpRl/s=
@@ -236809,6 +236805,7 @@ r62Orx3wgPi64IleEyLC+w436bWtrb9e
 7qExzN5Z+36OxW4qaPchIiU6A5w2hjQlSmARnfpRl/s=
 H8F2esL7Z4tGqH0EgB3TGdJ7mB+QONWuSmARnfpRl/s=
 MJhwVaVAuvFH4uJw0Az61tJ7mB+QONWuSmARnfpRl/s=
+T3c4w4AtBnCOxW4qaPchIiU6A5w2hjQlSmARnfpRl/s=
 Wof30x9OHFlaJOUR9ohFyHjpxQ5rRZjV
 MdsmSlG78iW/57i9m0GDw1rWyf5iSB/f
 uEbQNOzB4vtsFl9nR2nOdalOmVgltgUySmARnfpRl/s=
@@ -250439,9 +250436,11 @@ OMMAWqb7Nuc70YA5T6KeMYdXyPLUrPPdSmARnfpRl/s=
 b7JB5fMSKxvvIoFha8rkPHrwlgECf78d
 5reS1ayoFjNmH6sUuekvEFrWyf5iSB/f
 Pb21kDFksAQZ3M5T2RXqwM/UBy0Hsk80SmARnfpRl/s=
+UcvgigUAIm987OfXv8VpMes3AKEnLkyakTx6Heidduc=
 PbNnZyrDw4FRMjRyfLlTKFIll+3GNAPD
 2s+Nci9wvwcGwhVC5PpY6+f+zpgARLsn
-2s+Nci9wvweK3KXUbQsrtISQBZUZqxis/N40G2/PeS4=
+2s+Nci9wvweKQE9q0AwMBfvU3IYkvVkEqiqjadtlE64=
+2s+Nci9wvweK3KXUbQsrtOs3AKEnLkyakTx6Heidduc=
 2s+Nci9wvwdZqPGtQn/hwPMuE3t679MA0UxEdN+g/fg=
 mHeyuSr0yfEDlU+SYrCBG82xVF6SdV1h
 XuImXVhJO55x3BJCV1m3RM1ZuYht7syv
@@ -270706,7 +270705,7 @@ ujv6vg2wZzzpeL5HKEMOp1SgOSpmVTazSmARnfpRl/s=
 xEznwH0ov0lxMI4QMaS45qzzx+5DqaQ/SmARnfpRl/s=
 7h6CCA8K9FlnW3q1VGXEH/rYa3Bbw1o3CdCUpQrDu9Uoi0d6g9GOLw==
 7h6CCA8K9FlnW3q1VGXEHzA2Jv7ricY1M6tjqsstorxWgHE3Y5h4coxoaH4onVsRqvWd8a75aCo=
-7h6CCA8K9Fm+kixR7qTuEH+Faava2vCZor6fGkCqt5Y=
+7h6CCA8K9Fm+kixR7qTuEH+Faava2vCZv9+oeKExRio=
 7h6CCA8K9FkjHuqBeeQzop7VxmYtApY4jY7H7wFG5IQ=
 7h6CCA8K9FkjHuqBeeQzomSzmQs2DhwkueFkacWcmC98uetig8NMUQ==
 f2t3pcBS0MSJc2fM6Xzjk5osCfCcXjHqxndLCcq9s1E=
@@ -286611,6 +286610,10 @@ aM6jPf4QFifuSeyLUHc5px3YoElUohuftmVPxqTERXfAJ6bolZJMH286bqR8mFg9/jdwAtCPvbo=
 aM6jPf4QFic7zs+BpfcH1rg7EOQAzFlojhht4XZGwUgyajVLKU3kFQ==
 aM6jPf4QFieI5Vo/l5u9tPrTFF6ae4n8r/CHxVfGGBmdYdvcLM6ik1IRjqdak8yL
 aM6jPf4QFieI5Vo/l5u9tLUbNJe4NtdFyouJXyQlxHvnWPsOjuTUd3IGzfi3Eb4D1fA5ZvdSFYt5RVrRbt4lTQ==
+aM6jPf4QFieI5Vo/l5u9tLUbNJe4NtdFP2X+20Qod7YFOoZ8+FPZnlmEXY0nqNjGISTwD+bSI4l0+S+cQaVppmhrEg5wShU60ulq9f6Vhbs=
+aM6jPf4QFieI5Vo/l5u9tLUbNJe4NtdFP2X+20Qod7YFOoZ8+FPZnlmEXY0nqNjGISTwD+bSI4m2M9Jp3aZ23WhrEg5wShU6aZsoKV0T4Rk=
+aM6jPf4QFieI5Vo/l5u9tLUbNJe4NtdFP2X+20Qod7YFOoZ8+FPZnlmEXY0nqNjGISTwD+bSI4mCGaqLHXvs5yrZeyH4WR+F3/3qOqedV0o=
+aM6jPf4QFieI5Vo/l5u9tLUbNJe4NtdFP2X+20Qod7YFOoZ8+FPZnlmEXY0nqNjGISTwD+bSI4mCGaqLHXvs57iu0w7uFUC1GCM+/YpWs18=
 aM6jPf4QFieI5Vo/l5u9tB3YoElUohuftmVPxqTERXfYlDgLD6twKnuVZd+Y+NHy1CnvP5Hrw1pP7Af1271VkEpgEZ36UZf7
 aM6jPf4QFieI5Vo/l5u9tB3YoElUohuftmVPxqTERXfYlDgLD6twKmr8Vhgzztk04dMB706w1rtSsQfex4JFZ8NEAbp6LzV0
 aM6jPf4QFieI5Vo/l5u9tB3YoElUohuftmVPxqTERXfYlDgLD6twKlGTB3odKWftlKKuYx+i0eRSsQfex4JFZ7QggTtU4jF0