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

Conflicts:
	src/main/java/com/nis/domain/Page.java
	src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
	src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp

src/main/java/com/nis/web/security/FormAuthenticationFilter.java

@@ -74,14 +74,14 @@ public class FormAuthenticationFilter extends org.apache.shiro.web.filter.authc.
 		String className = e.getClass().getName(), message = "";
 		if (IncorrectCredentialsException.class.getName().equals(className)
 				|| UnknownAccountException.class.getName().equals(className)){
-			message = "用户或密码错误, 请重试.";
+			message = "loginName_error";
 		}
 		else if (e.getMessage() != null && StringUtils.startsWith(e.getMessage(), "msg:")){
 			message = StringUtils.replace(e.getMessage(), "msg:", "");
 		}
 		
 		else{
-			message = "系统出现点问题，请稍后再试！";
+			message = "system_error";
 			e.printStackTrace(); // 输出到控制台
 		}
         request.setAttribute(getFailureKeyAttribute(), className);