diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index cde6feab7..e05f72464 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1323,14 +1323,10 @@ transfer_bytes=Transfer Bytes
 user_info=User Info
 user_list=User List
 equal_password=Password Inconsistent!
-outgoing_unicast_packets=Outgoing Unicast Packets
-outgoing_unicast_total_size=Outgoing Unicast Total Size
-outgoing_broadcast_packets=Outgoing Broadcast Packets
-outgoing_broadcast_total_size=Outgoing Broadcast Total Size
-incoming_unicast_packets=Incoming Unicast_packets
-incoming_unicast_total_size=Incoming Unicast Total Size
-incoming_broadcast_packets=Incoming Broadcast Packets
-incoming_broadcast_total_size=Incoming Broadcast Total Size 
+outgoing_unicast_packets=Upload Packets
+outgoing_unicast_total_size=Upload Byte
+incoming_unicast_packets=Download Packets
+incoming_unicast_total_size=Download Byte
 address_pool=Address Pool
 ip_total=IP Total
 available_ip_total=Available IP Total
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 50bcee0f2..e554de19b 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1323,14 +1323,10 @@ transfer_bytes=Transfer Bytes
 user_info=User Info
 user_list=User List
 equal_password=Password Inconsistent!
-outgoing_unicast_packets=Outgoing Unicast Packets
-outgoing_unicast_total_size=Outgoing Unicast Total Size
-outgoing_broadcast_packets=Outgoing Broadcast Packets
-outgoing_broadcast_total_size=Outgoing Broadcast Total Size
-incoming_unicast_packets=Incoming Unicast_packets
-incoming_unicast_total_size=Incoming Unicast Total Size
-incoming_broadcast_packets=Incoming Broadcast Packets
-incoming_broadcast_total_size=Incoming Broadcast Total Size 
+outgoing_unicast_packets=Upload Packets
+outgoing_unicast_total_size=Upload Byte
+incoming_unicast_packets=Download Packets
+incoming_unicast_total_size=Download Byte 
 address_pool=Address Pool
 ip_total=IP Total
 available_ip_total=Available IP Total
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 0ae47723f..32f4a78b0 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1321,14 +1321,10 @@ transfer_bytes=\u4F20\u8F93\u6570\u636E\u5B57\u8282
 user_info=\u7528\u6237\u4FE1\u606F
 user_list=\u7528\u6237\u5217\u8868
 equal_password=\u5BC6\u7801\u4E0D\u4E00\u81F4\uFF01
-outgoing_unicast_packets=\u4E0A\u4F20\u6570\u636E\u5305\u6570
-outgoing_unicast_total_size=\u4E0A\u4F20\u5B57\u8282\u6570
-outgoing_broadcast_packets=outgoing_broadcast_packets
-outgoing_broadcast_total_size=outgoing_broadcast_total_size
-incoming_unicast_packets=\u4E0B\u8F7D\u6570\u636E\u5305\u6570
-incoming_unicast_total_size=\u4E0B\u8F7D\u6570\u636E\u5B57\u8282\u6570
-incoming_broadcast_packets=incoming_broadcast_packets
-incoming_broadcast_total_size=incoming_broadcast_total_size
+outgoing_unicast_packets=Upload Packets
+outgoing_unicast_total_size=Upload Byte
+incoming_unicast_packets=Download Packets
+incoming_unicast_total_size=Download Byte
 address_pool=\u5730\u5740\u6C60
 ip_total=IP\u603B\u6570
 available_ip_total=\u53EF\u7528IP\u6570
diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index ecfe72e8d..ae075b913 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -531,7 +531,7 @@ mmFileDigestLog=mmFileDigestLogs
 ntcStreamMediaLog=ntcStreamMediaLogs
 #\u97f3\u89c6\u9891\u6837\u4f8b\u9650\u5236\u65f6\u957f\uff0c\u5355\u4f4d\u79d2
 av_duration_limit=120
-video_to_picture_proc=/root/code/shot_detect/shot_detect
+video_to_picture_proc=/home/ceiec/av_feature_gen/save_video_frame
 #\u8bc1\u4e66\u6587\u4ef6\u8def\u5f84
 cert_file_path=/home/cert/
 #\u8bc1\u4e66\u6821\u9a8c\u5de5\u5177\u540d\u79f0
diff --git a/src/main/resources/sql/20181201/update_app_behavior_dic.sql b/src/main/resources/sql/20181201/update_app_behavior_dic.sql
new file mode 100644
index 000000000..c5bce428d
--- /dev/null
+++ b/src/main/resources/sql/20181201/update_app_behavior_dic.sql
@@ -0,0 +1,6 @@
+#APP_POLICY界面上的隧道类型multimedia video编码从1变为90001，other编码从6变为90006 
+update specific_service_cfg a set a.spec_service_code=90006 where a.spec_service_code=6 and a.cfg_type=2 and a.spec_service_name='other';
+update specific_service_cfg a set a.spec_service_code=90001 where a.spec_service_code=1 and a.cfg_type=2 and a.spec_service_name='multimedia_video';
+#Tor mode、Tor broswer、Opera Turbo、Opera mini的行为类型见“行为类型” sheet
+update specific_service_cfg set parent_id=36,is_leaf=1 where spec_service_id in(35,283);
+update specific_service_cfg set parent_id=47,is_leaf=1 where spec_service_id in(45,46);