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

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

GDMS.iml

@@ -19,11 +19,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Tomcat 8.5.37" level="application_server_libraries" />
+    <orderEntry type="library" scope="PROVIDED" name="Tomcat 9.0.13" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar!/" />
+          <root url="jar://C:/Program Files/apache-tomcat-9.0.13/lib/tomcat-jdbc.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

src/servlet/account/S_Register.java

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