modif photo_video
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/artiste.php
modif photo_video
modif function photo_video dans artiste