payment by CB
Merge branch 'monetique' of https://github.com/MIWA-ST/MIWA2014 into monetique

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