Update
Merge branch 'master' of https://github.com/Marcleking/coureur_laravel

Conflicts:
	public/ajax/notif48HrsAvant.php