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

# Conflicts:
#	src/servlet/account/Register.java

src/servlet/Submit/S_TextSubmit.java

@@ -7,8 +7,8 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-@WebServlet("/submit")
-public class S_Submit extends HttpServlet {
+@WebServlet("/textsubmit")
+public class S_TextSubmit extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         super.doPost(request, response);
         String content=new String(request.getParameter("text").getBytes("ISO8859-1"),"UTF-8");