osef
Merge branch 'master' of https://github.com/NicolasCARPi/noforget

Conflicts:
	admin-exec.php