Merge remote-tracking branches 'remotes/origin/master' and 'remotes/origin/wlf' into wmj

# Conflicts:
#	GDMS.iml
#	src/servlet/account/login.java

src/servlet/account/login.java

@@ -31,13 +31,10 @@ public class login extends HttpServlet {
       } catch (Exception e) {
         e.printStackTrace();
       }
-<<<<<<< .merge_file_a01548
     request.getSession().setAttribute("User",user);
       request.getRequestDispatcher("/home.jsp").forward(request,response);
-=======
       request.getSession().setAttribute("User",user);
     request.getRequestDispatcher("/home.jsp").forward(request,response);
->>>>>>> .merge_file_a15580
   }
 
   protected void doGet(HttpServletRequest request, HttpServletResponse response)