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

Conflicts:
	admin_pams/view/photos.tpl
suppr du merge de merde