update gal
Merge branch 'master' of https://github.com/Alexiscap/slyset

Conflicts:
	application/controllers/pop_in_general.php
	application/models/melo_actus_model.php
	assets/javascript/jquery.colorbox.js
	assets/javascript/slyset.js
affichage