Merge remote-tracking branch 'origin/master'

Conflicts:
	war/WEB-INF/classes/franciliens/servlets/AccueilServlet.class
	war/WEB-INF/classes/franciliens/servlets/LoginServlet.class