merge
Merge branch 'master' of https://github.com/yakasan/E-S-Photographie

Conflicts:
	admin_pams/model/class.model.php
Merge branch 'master' of https://github.com/yakasan/E-S-Photographie

Conflicts:
	admin_pams/model/class.model.php