Pour lolita

…
Merge branch 'master' of https://github.com/AxelBaron/Pxl

Conflicts:
	index.php