commit pour récup
Merge remote-tracking branch 'origin/master'

Conflicts:
	war/WEB-INF/classes/franciliens/servlets/LoginServlet.class
Merge branch 'master' of https://github.com/MDiana/FranciLiens