Main modifié
Merge branch 'CRM' of https://github.com/iNowa/MIWA2014 into HEAD

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