Merge remote-tracking branch 'remotes/origin/master' into wlf

# Conflicts:
#	src/core/process/Process.java

src/servlet/basic_settings/S_Filter.java

@@ -0,0 +1,17 @@
+package servlet.basic_settings;
+
+import javax.servlet.*;
+import java.io.IOException;
+
+public class S_Filter implements Filter {
+
+    public void init(FilterConfig filterConfig) throws ServletException {
+
+    }
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+
+    }
+    public void destory(){
+
+    }
+}