Merge origin/master

Conflicts:
	web/includes/chapters/5/1.xhtml