Chevalier de plus.
Merge branch 'integration' of http://www.github.com/gabc/cegepofempire into integration

Conflicts:
	modele_client.py