Merge masting into merge_guides2 and fix SQL problems.
Merge branch 'new-guides-clean-merge' of https://github.com/PonteIneptique/docview into merge_guides2

Conflicts:
	test/resources/guide-fixtures.sql