"le gros de toute les pages finis
Merge branch 'master' of https://github.com/Alexiscap/slyset

Conflicts:
	application/controllers/pop_in_general.php