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

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

src/servlet/account/S_Register.java

@@ -1,4 +1,37 @@
 package servlet.account;
 
-public class S_Register {
+import core.user.User;
+import core.user.utils.AccountManagement;
+import error.GExcptSQL;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+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);
+        Map<String,String> user_info=new HashMap<>();
+        String id=request.getParameter("id");
+        user_info.put("id",id);
+        String name=request.getParameter("name");
+        user_info.put("name",name);
+        String e_mail=request.getParameter("e-mail");
+        user_info.put("e-mail",e_mail);
+        String phone_number=request.getParameter("phone-number");
+        user_info.put("phone-number",phone_number);
+        String password=request.getParameter("password");
+        user_info.put("password",password);
+        User user=null;
+        try {
+            user = AccountManagement.register("student",user_info);
+        } catch (GExcptSQL gExcptSQL) {
+            gExcptSQL.printStackTrace();
+        }
+
+    }
 }

src/servlet/account/login.java

@@ -2,13 +2,11 @@ package servlet.account;
 
 import java.io.IOException;
 import java.sql.SQLException;
-
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import core.user.Student;
 import core.user.User;
 import core.user.utils.AccountManagement;