vardump loic
Merge branch 'origin/master'

Conflicts:
	Untitled.php