juste pour pouvoir merge
Merge branch 'master' of https://github.com/lesquoyb/Cocktailator

Conflicts:
	menu.php
Merge branch 'master' of https://github.com/lesquoyb/Cocktailator

Conflicts:
	menu.php