modification horaires + a propos
Merge remote-tracking branch 'origin/design' into design

Conflicts:
	app/View/FrontEnd/index.ctp