Changement de Antho et François
Merge branch 'master' into AnthonyLalala

Conflicts:
	.gitignore
	src/main/webapp/WEB-INF/layouts/standard.jsp