modif merge
Merge https://github.com/yakasan/E-S-Photographie

Conflicts:
	admin_pams/model/class.model.php
Merge https://github.com/yakasan/E-S-Photographie
modif merge