scrum
Merge branch 'master' of https://github.com/gabc/cegepofempire into integration
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration
recolte de ressources
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration

Conflicts:
	modele_client.py