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/webapp/WEB-INF/views/cfg/stringCfgForm.jsp

@@ -26,22 +26,6 @@ $(function(){
 	</div>
 </div>
 <div class="row">
-	<c:if test="${region.configRegionValue eq 'NTC_P2P_HASH_BIN'}">
-	<div class="col-md-6">
-		<div class="form-group">
-			<label class="control-label col-md-3"><spring:message code="p2p_hash_type"/></label>
-			<div class="col-md-6">
-				<select name="userRegion2" class="selectpicker show-tick form-control">
-				<option value=""><spring:message code="select"/></option>
-				<c:forEach items="${fns:getDictList('P2P_HASH_TYPE')}" var="hashType">
-						<option value="${hashType.itemCode}" <c:if test="${_cfg.p2pHashList[0].userRegion1==hashType.itemCode}">selected</c:if> ><spring:message code="${hashType.itemValue}"/></option>
-				</c:forEach>
-				</select>
-			</div>
-			<div for="userRegion2"></div>
-		</div>
-	</div>
-	</c:if>
 	<div class="col-md-6">
 		<div class="form-group">
 			<label class="control-label col-md-3"><font color="red">*</font>