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

Conflicts:
	src/main/resources/messages/message_en.properties
修改国际化文件；
修改dns和account的匹配方式为多种匹配方式
app和asn的监测配置都默认为记录全日志
样例的level修改时未展示正确的level值

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

@@ -171,7 +171,7 @@ $(function(){
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
 											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-												<c:if test="${dict.itemCode eq 0}">
+												<c:if test="${dict.itemCode eq 1}">
 													<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
 												</c:if>
 											</c:forEach>