faq update
Merge remote-tracking branch 'origin/SchemaHandling' into siteContent
fix broken site generation
missing commit of tutorial 16
Merge branch 'master' into siteContent
Merge remote-tracking branch 'origin/master' into siteContent

Conflicts:
	src/site/apt/faq.apt
downmerge from site content branch
Merge branch 'siteContent'