Changes according to Irène Wyss
Merge branch 'master' into individual_tasks

Conflicts:
	source/index.html.slim