Suppression des fichiers cake du git
Augmentation de la limite du timeout
Merge remote-tracking branch 'origin/master' into refactoringjs

Conflicts:
	app/Controller/GameController.php