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

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

src/servlet/S_TeaccherSelectStudent.java

@@ -0,0 +1,4 @@
+package servlet;
+
+public class S_TeaccherSelectStudent {
+}

src/servlet/account/S_Register.java

@@ -32,6 +32,7 @@ public class S_Register extends HttpServlet {
         } catch (GExcptSQL gExcptSQL) {
             gExcptSQL.printStackTrace();
         }
+        //注册失败
         request.getSession().setAttribute("User",user);
         request.getRequestDispatcher("/home.jsp").forward(request,response);
 

src/servlet/basic_settings/S_Listener.java

@@ -0,0 +1,4 @@
+package servlet.basic_settings;
+
+public class S_Listener {
+}

web/select.jsp

@@ -25,7 +25,7 @@
             <div class="select-blank"></div>
             <div class="selected-bottom"></div>
         </div>
-        <div class="list-frame bar-change">
+        <div class="list-frame bar-hange">c
             <div class="list-child">
                 <div class="name"><span class="the-name">李先生</span></div>
                 <div class="other-msgs">