Merge branch 'master' of https://bdgit.educoder.net/zhailw/gdms into wlf

# Conflicts:
#	GDMS.iml
#	src/servlet/account/login.java

src/servlet/basic_settings/S_Filter.java

@@ -10,7 +10,6 @@ import java.io.IOException;
 public class S_Filter implements Filter {
     String NO_LOGIN="/notLogin";
     String includeUrls="/gdms/login.jsp";
-    @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws ServletException,IOException{
         HttpServletRequest request=(HttpServletRequest) servletRequest;
         HttpServletResponse response=(HttpServletResponse) servletResponse;