Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Conflicts:
	src/main/resources/sql/function_region_dict_add_colunm.sql
	所有配置界面修改为使用region表动态属性值

src/main/resources/messages/message_en.properties

@@ -774,8 +774,8 @@ res_group_num=Response Group Number
 policy_number_value_valid=The policy number can only be 0, or more than 100
 policy_number_value_unique=The policy number has already existed
 location=Location
-extra=Abroad
-intra=Territory
+extra=Outbound
+intra=Inbound
 #=============about Maintenance=========
 #=============some validation===========
 line=line %s