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

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

src/servlet/account/S_Register.java

@@ -21,9 +21,9 @@ public class S_Register extends HttpServlet {
         String name=request.getParameter("name");
         user_info.put("name",name);
         String e_mail=request.getParameter("e-mail");
-        user_info.put("e-mail",e_mail);
+        user_info.put("e_mail",e_mail);
         String phone_number=request.getParameter("phone-number");
-        user_info.put("phone-number",phone_number);
+        user_info.put("phone_number",phone_number);
         String password=request.getParameter("password");
         user_info.put("password",password);
         User user=null;