Merge branch 'master' of github.com:Nitix/Crazy-Charly-Day

Conflicts:
	src/Vue/RestoVue.php

Signed-off-by: HakshoLOL <adri1du54@hotmail.fr>