Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	src/main/resources/nis.properties
修复单个appHTTP界面cfgType多余问题
x509校验证书
字符串模板导出问题修复

src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp

@@ -117,7 +117,6 @@ $(function(){
 								</div>
 							<c:forEach items="${regionList}" var="region">
                    			<c:if test="${_cfg.functionId eq region.functionId}">
-                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
                    				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
                    				<input type="hidden" name="cfgRegionCode" serviceType="${region.configServiceType }" value="${region.configRegionCode }">
 								<input type="hidden" name="configMultiKeywords" value="${region.configMultiKeywords }">