Merge branch 'livedoc' into develop

Conflicts:
	docs/manual/source/recommendation/dase.html.md
	docs/manual/source/recommendation/reading-custom-events.html.md