diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 9af169396..e315f4c40 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -17,7 +17,7 @@ updatePwd=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043F\u0430\u0440\u0
 show=\u043F\u043E\u043A\u0430\u0437\u0430\u0442\u044C
 edit= \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C
 hi=\u041F\u0440\u0438\u0432\u0435\u0442
-Exit=\u0412\u044B\u0445\u043E\u0434
+exit=\u0412\u044B\u0445\u043E\u0434
 choose=\u0412\u044B\u0431\u0440\u0430\u0442\u044C
 onloading=\u0417\u0430\u0433\u0440\u0443\u0437\u043A\u0430 ...
 #==========menu begin=====================
@@ -98,7 +98,7 @@ service_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u04
 system_service_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0431\u0438\u0437\u043D\u0435\u0441-\u0442\u0438\u043F\u043E\u043C \u0441\u0438\u0441\u0442\u0435\u043C\u044B
 features_area=\u0417\u043E\u043D\u0430 \u0441\u043F\u0435\u0446\u0438\u0444\u0438\u043A\u0438
 attribute_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0441\u0432\u043E\u0439\u0441\u0442\u0432\u0430\u043C\u0438
-Isp_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440\u043E\u043C
+isp_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440\u043E\u043C
 ip_multiple_control=IP \u043C\u043D\u043E\u0433\u043E\u0434\u043E\u043C\u0435\u043D\u043D\u043E\u0435 \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435
 ip_port_control=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 IP + \u043F\u043E\u0440\u0442\u0430\u043C\u0438
 website_multiple_control=\u041C\u043D\u043E\u0433\u043E\u0434\u043E\u043C\u0435\u043D\u043D\u043E\u0435 \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0432\u0435\u0431-\u0441\u0430\u0439\u0442\u043E\u043C
@@ -1024,7 +1024,6 @@ MM_AV_URL=\u0410\u0443\u0434\u0438\u043E \u0438 \u0432\u0435\u0434\u0438\u043E U
 MM_VOIP_IP=VoIP IP
 MM_VOIP_ACCOUNT=\u0421\u0447\u0435\u0442 VoIP
 #=======================for import ip configuration=================
-<<<<<<< HEAD
 drop_ip=\u041E\u0442\u0431\u0440\u0430\u0441\u044B\u0432\u0430\u043D\u0438\u0435IP
 loop_ip=\u0420\u0435\u0444\u043B\u044E\u043A\u0441 IP
 drop_or_loop_ip=\u041E\u0442\u0431\u0440\u0430\u0441\u044B\u0432\u0430\u043D\u0438\u0435/\u0420\u0435\u0444\u043B\u044E\u043A\u0441 IP
@@ -1040,7 +1039,6 @@ tunnel_code=\u0421\u0435\u0440\u0438\u0439\u043D\u044B\u0439 \u043D\u043E\u043C\
 tunnel_name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0437\u0430\u0448\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0433\u043E \u0442\u0443\u043D\u043D\u0435\u043B\u044C\u043D\u043E\u0433\u043E \u043F\u043E\u0432\u0435\u0434\u0435\u043D\u0438\u044F
 tunnel_desc= \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435 \u0437\u0430\u0448\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0433\u043E \u0442\u0443\u043D\u043D\u0435\u043B\u044C\u043D\u043E\u0433\u043E \u043F\u043E\u0432\u0435\u0434\u0435\u043D\u0438\u044F
 call_external_procedures_failed=\u041E\u0448\u0438\u0431\u043A\u0430 \u0432\u044B\u0437\u043E\u0432\u0430 \u0432\u043D\u0435\u0448\u043D\u0435\u0439 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u044B
-=======
 drop_ip=IP Drop
 loop_ip=IP Loop
 drop_or_loop_ip=IP Drop Or Loop
@@ -1050,4 +1048,3 @@ file_desc=File Desc
 content_type=Content Type
 content_length=Content Length
 response_file=Response File
->>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
index 059271b01..bf8d965d6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
@@ -248,6 +248,45 @@
 									<!--/ip info-->
 									</c:if>
 									<c:if test="${region.regionType eq 2 }">
+									<c:if test="${region.configServiceType eq 'ftp_url' }">
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+										<h4 class="form-section">
+											<spring:message code="${region.configRegionValue}" />
+											<small> <span
+												class="glyphicon glyphicon-plus ${tabName}Add"
+												onClick="addContent(this,'${tabName}')" title="add"></span></small>
+										</h4>
+										<c:set var="cfgName" value="stringList[${strCfgIndex}]"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+										<c:choose>
+											<c:when test="${fn:length(_cfg.stringList)>0}">
+												<c:set var="isBreak" value="false" ></c:set>
+												<c:forEach items="${_cfg.stringList}" var="cfg">
+													<c:choose>
+														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
+															<div class="row boxSolid ${tabName}${status.index}">
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+															</div>
+															<c:set var="isBreak" value="true" ></c:set>
+															<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+														</c:when>
+													</c:choose>
+												</c:forEach>
+												<c:if test="${!isBreak}">
+													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+													</div>
+													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+												</c:if>
+											</c:when>
+											<c:otherwise>
+												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+												</div>
+												<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+											</c:otherwise>
+										</c:choose>
+									</c:if>
 									<c:if test="${region.configServiceType eq 'keywords' }">
 										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
 										<h4 class="form-section">
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
index 34229a3a5..87d449a6c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
@@ -19,7 +19,6 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>
 	</div>
 </c:forEach>
-
 </div>
 <c:forEach items="${tabList}" var="region">
 	<c:if test="${region[0] eq 1 }">
@@ -37,8 +36,8 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='ip_pattern'/>:</label>
@@ -49,7 +48,8 @@
 								</label>
 							</div>
 						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_ip'/>:</label>
@@ -70,15 +70,15 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
@@ -91,8 +91,8 @@
 								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='direction'/>:</label>
@@ -103,8 +103,8 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='protocol'/>:</label>
@@ -117,6 +117,7 @@
 						</div>
 					</div>
 				</div>
+			</div>
 			</c:if>
 			</c:forEach>
 	</c:if>
@@ -130,8 +131,8 @@
 								<label><spring:message code='district' />:</label><label>${cfg.district }</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
 								<label><spring:message code='keywords' />:</label>
@@ -153,8 +154,8 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='match_method' />:</label>
@@ -165,8 +166,8 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='whether_hexbinary' />:</label>
@@ -192,7 +193,7 @@
 								<label><spring:message code='raw_len' />:</label><label>${cfg.rawLen }</label>
 							</div>
 						</div>
-						</div>
+					</div>
 					<div class="row">						
 						<div class="col-md-4">
 							<div class="form-group">
@@ -213,8 +214,8 @@
 								</a>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
 								<label><spring:message code='file_url' />:</label>
@@ -255,8 +256,8 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='match_method' />:</label>
@@ -267,8 +268,8 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='whether_hexbinary' />:</label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
index d92dbada6..9de33fb79 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
@@ -260,79 +260,92 @@
 									<!--/ip info-->
 									</c:if>
 									<c:if test="${region.regionType eq 2 }">
-										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
-										<h4 class="form-section">
-											<spring:message code="${region.configRegionValue}" />
-											<small> <span
-												class="glyphicon glyphicon-plus ${tabName}Add"
-												onClick="addContent(this,'${tabName}')" title="add"></span></small>
-										</h4>
-										<c:if test="${region.configServiceType eq 'subscribe_id' }">
-											<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIdIndex}]"></c:set>
-										</c:if>
 										<c:if test="${region.configServiceType ne 'subscribe_id' }">
+											<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+											<h4 class="form-section">
+												<spring:message code="${region.configRegionValue}" />
+												<small> <span
+													class="glyphicon glyphicon-plus ${tabName}Add"
+													onClick="addContent(this,'${tabName}')" title="add"></span></small>
+											</h4>
 											<c:set var="cfgName" value="sslList[${strCfgIndex}]"></c:set>
+											<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+											<c:choose>
+													<c:when test="${fn:length(_cfg.sslList)>0}">
+														<c:set var="isBreak" value="false" ></c:set>
+														<c:forEach items="${_cfg.sslList}" var="cfg">
+															<c:choose>
+																<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
+																	<div class="row boxSolid ${tabName}${status.index}">
+																		<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+																	</div>
+																	<c:set var="isBreak" value="true" ></c:set>
+																	
+																		<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+																</c:when>
+															</c:choose>
+														</c:forEach>
+														<c:if test="${!isBreak}">
+															<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+															</div>
+																	
+															<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+															
+														</c:if>
+													</c:when>
+													<c:otherwise>
+														<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+															<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+														</div>
+														<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+													</c:otherwise>
+											</c:choose>
 										</c:if>
-										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
-										<c:choose>
-											<c:when test="${fn:length(_cfg.sslList)>0}">
-												<c:set var="isBreak" value="false" ></c:set>
-												<c:forEach items="${_cfg.sslList}" var="cfg">
-													<c:choose>
-														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
-															<div class="row boxSolid ${tabName}${status.index}">
+										<c:if test="${region.configServiceType eq 'subscribe_id' }">
+											<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+											<h4 class="form-section">
+												<spring:message code="${region.configRegionValue}" />
+												<small> <span
+													class="glyphicon glyphicon-plus ${tabName}Add"
+													onClick="addContent(this,'${tabName}')" title="add"></span></small>
+											</h4>
+												<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIdIndex}]"></c:set>
+											<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+											<c:choose>
+													<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
+														<c:set var="isBreak" value="false" ></c:set>
+														<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
+															<c:choose>
+																<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
+																	<div class="row boxSolid subscribeId ${tabName}${status.index}">
+																		<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+																	</div>
+																	<c:set var="isBreak" value="true" ></c:set>
+																		<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+																</c:when>
+															</c:choose>
+														</c:forEach>
+														<c:if test="${!isBreak}">
+															<div class="row boxSolid ${tabName}${status.index} hidden disabled">
 																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
-															<c:set var="isBreak" value="true" ></c:set>
-															<c:if test="${region.configServiceType ne 'subscribe_id' }">
-																<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
-															</c:if>
-														</c:when>
-													</c:choose>
-												</c:forEach>
-												<c:if test="${!isBreak}">
-													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
-													</div>
-															<c:if test="${region.configServiceType ne 'subscribe_id' }">
-																<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
-															</c:if>
-												</c:if>
-											</c:when>
-											<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
-												<c:set var="isBreak" value="false" ></c:set>
-												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
-													<c:choose>
-														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
-															<div class="row boxSolid subscribeId ${tabName}${status.index}">
-																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
-															</div>
-															<c:set var="isBreak" value="true" ></c:set>
 																<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
-														</c:when>
-													</c:choose>
-												</c:forEach>
-												<c:if test="${!isBreak}">
-													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
-													</div>
-													<c:if test="${region.configServiceType eq 'subscribe_id' }">
-																<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
-															</c:if>
-												</c:if>
-											</c:when>
-											<c:otherwise>
-												<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
-													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
-												</div>
-												<c:if test="${region.configServiceType eq 'subscribe_id' }">
-													<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
-												</c:if>
-												<c:if test="${region.configServiceType ne 'subscribe_id' }">
-													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
-												</c:if>
-											</c:otherwise>
-										</c:choose>
+														</c:if>
+													</c:when>
+													<c:otherwise>
+														<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
+															<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+														</div>
+														<c:if test="${region.configServiceType eq 'subscribe_id' }">
+															<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+														</c:if>
+														<c:if test="${region.configServiceType ne 'subscribe_id' }">
+															<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+														</c:if>
+													</c:otherwise>
+											</c:choose>
+										</c:if>
 									</c:if>
 								</c:forEach>
 								<br>