Add character management in situations
Merge branch 'master' of https://github.com/titiyo/gameGeneratorMVC

Conflicts:
	Controller/ControllerGame.php

Ajout gestion personnages ennemis