past events at the bottom & in green
Merge remote-tracking branch 'origin/master'

Conflicts:
	projet_conf/app_cordova/www/accueil.html
	projet_conf/server/controler_admin.php