Merge pull request #28 from KCTHEBOSS/master

Changement Menu
suppression contactez-nous menu
ajout timeline

ajout timeline dans la page historique
Merge branch 'master' of https://github.com/asfcanada/asfcanada

Conflicts:
	bd/asfcanada.sql
Merge pull request #29 from gainde/master

timeline