Changement de Antho et François
My profil ajouté
Merge branch 'master' into AnthonyLalala

Conflicts:
	.gitignore
	src/main/webapp/WEB-INF/layouts/standard.jsp
avancee de pierrot et amandine lol
Merge branch 'pierrot'
Merge branch 'amandine-constant'

Conflicts:
	src/main/webapp/WEB-INF/views/users/tiles.xml
amandine et harold