Fix broken markdown
Merge branch '20' into 21

Conflicts:
	Database-Model/_index.md
Fix additional broken markdown