j'essai d'afficher les vignettes
Merge branch 'master' of https://github.com/yakasan/E-S-Photographie

Conflicts:
	admin_pams/view/photos.tpl
lolilol
Merge branch 'master' of https://github.com/yakasan/E-S-Photographie
Merge branch 'master' of https://github.com/yakasan/E-S-Photographie

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

Conflicts:
	admin_pams/inscriptadmin.php
test vignette
Merge branch 'master' of https://github.com/yakasan/E-S-Photographie

Conflicts:
	gallery/test/erffghj.jpeg