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

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
	
	修改是否十六进制选项选中值

src/main/webapp/WEB-INF/include/form/complexInfo.jsp

@@ -6,6 +6,8 @@
 		<input type="hidden" name="cfgType" value="${region.configRegionValue }">
 		<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode }">
 		<input type="hidden" name="configMultiKeywords" value="${region.configRegionCode }">
+		<input type="hidden" name="configServiceType" value="${region.configServiceType }">
+		<input type="hidden" name="configHex" value="${region.configHex }">
 </head>
 <c:if test="${!empty region.configDistrict }">
 	<div class="row">