pour recup inte
Merge branch 'master' of https://github.com/Alexiscap/slyset

Conflicts:
	application/views/photos/mc_photos.php
photo ok