Merge origin/Emmanuelle into gael

Conflicts:
	web/WEB-INF/bordure/AffichageTheme.jsp