k
jMerge branch 'master' of https://github.com/yakasan/E-S-Photographie

Conflicts:
	admin_pams/controller/generalController.php