SUperModif
Merge branch 'master' of github.com:misterj/NF17

Conflicts:
	controller/Client.php
Merge branch 'master' of github.com:misterj/NF17
KOUKOU
Merge branch 'master' of github.com:misterj/NF17