debut reaffichage timeline
Merge branch 'master' of https://github.com/Lpcm/cahier

Conflicts:
	views/formateur/home.jade
Reaffichage de la timeline
Merge branch 'master' of https://github.com/Lpcm/cahier