insertion de la classe grille et nettoyage des noms
Merge branch 'master' of https://github.com/xsinotron/TBW

Conflicts:
	app/Controllers/Main.php