kdfjhbvùliqdfjnv!lmfnbdlknsdfklnbljkdfklbhlksdfùbnlsdfgnhbjlgnfdlbh TAAAAAAA MERERERERERERERE!!!!!
Merge branch 'master' of https://github.com/jfpicard/imoe_minigrc

Conflicts:
	src/fr/sigl/imoe/minigrc/servlets/MVC2Servlet.java