11/03 - 16h47
Merge branch 'master' of https://github.com/CatRubenJoan/Restaurant

Conflicts:
	Restaurant-war/src/java/controllers/servletCreerObjet.java