maj
Merge branch 'master' of https://github.com/MaximeGuilloreau/BatmecaNewGeneration

Conflicts:
	src/controller/EditUserServlet.java