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

# Conflicts:
#	src/core/operation/Select.json
#	src/core/process/Process.java

web/login.jsp

@@ -53,7 +53,7 @@
                    placeholder="请输入电话">
             <input class="register-input-text check-password-text" type="password" name="password-check"
                    placeholder="请确认密码">
-            <select class="id-check" name="usertype">
+            <select class="id-check" name="userType">
                 <option value="">身份</option>
                 <option value="student">学生</option>
                 <option value="teacher">老师</option>