timer fonctionnel
Merge branch 'dev' of https://github.com/mjonckiere/hades into dev

Conflicts:
	application/modules/frontend/models/DbTable/Passage.php