commit partie 10
Merge remote-tracking branch 'origin/teo-pierre'

Conflicts:
	src/main/resources/META-INF/spring/shared/security.xml
	src/main/webapp/WEB-INF/layouts/standard.jsp