Test Billet
Merge branch 'master' of https://github.com/myweblog/MyWebLog

Conflicts:
	Projet_Web_my_weblog/Includes/menuAdmin.php