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

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

src/servlet/account/S_Register.java

@@ -13,8 +13,8 @@ import java.util.Map;
 
 public class S_Register extends HttpServlet {
     @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse resp) throws ServletException, IOException {
-        super.doPost(request, resp);
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        super.doPost(request, response);
         Map<String,String> user_info=new HashMap<>();
         String id=request.getParameter("id");
         user_info.put("id",id);
@@ -32,6 +32,8 @@ public class S_Register extends HttpServlet {
         } catch (GExcptSQL gExcptSQL) {
             gExcptSQL.printStackTrace();
         }
+        request.getSession().setAttribute("User",user);
+        request.getRequestDispatcher("/login.jsp").forward(request,response);
 
     }
 }