edit
Merge branch 'GestionCommerciale' of https://github.com/iNowa/MIWA2014.git into GestionCommerciale

Conflicts:
	GestionCommerciale/src/fr/epita/sigl/miwa/application/Main.java