Corrections mineures
Merge branch 'dev'

Conflicts:
	.gitignore
Suppressions des dossiers de dev
gitignore
gitignore
Merge dev->master
suppression .DS_Store
commit conflicts
Merge branch 'dev'

Conflicts:
	.gitignore
	Config/config.inc
	Includes/.DS_Store
	Includes/souvenirs/.DS_Store
	Templates/souvenirs/.DS_Store
Corrections avant mise en prod
re
Merge branch 'master' into dev
Nettoyage
Merge branch 'master' into dev
Correction pour afficher/télécharger les photos