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/views/cfg/complexCfgForm.jsp

@@ -15,6 +15,7 @@
 		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${region.configRegionCode }">
 		<input type="hidden" name="${cfgName}.configMultiKeywords" value="${region.configRegionCode }">
 		<input type="hidden" name="${cfgName}.configServiceType" value="${region.configServiceType }">
+		<input type="hidden" name="${cfgName}.configHex" value="${region.configHex }">
 <%-- 	</c:if>
 </c:forEach> --%>
 
@@ -186,12 +187,10 @@
 		            	<!-- isP2pHashCfg: P2PHash配置只能是十六进制字符 -->
 		            	<label class="radio-inline">
 		            		<input type="radio" name="${cfgName}.isHex" value="1" class="required"
-		            		<c:if test="${isP2pHashCfg}">checked disabled</c:if>
 		            		><spring:message code="hex"/>
 		            	</label>
 		            	<label class="radio-inline">
 		            		<input type="radio" name="${cfgName}.isHex" value="0" class="required"
-		            		<c:if test="${isP2pHashCfg}">disabled</c:if>
 		            		><spring:message code="not_hex"/>
 		            	</label>
 		            </div>