Merge origin/master into gael

Conflicts:
	web/WEB-INF/main/Main.jsp