cpu update
...
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration

Conflicts:
	modele_client.py
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration

Conflicts:
	Map.py
	deplacement.py
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration

Conflicts:
	modele_client.py
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration

Conflicts:
	modele_client.py
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration
fixed bug
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration