More Marington- inside and out. Oh, and database
Merge branch 'master' of https://github.com/jahales/Creativity

Conflicts:
	YAML/MapInfos.yaml
	YAML/System.yaml