Cleaned up code
Merge branch 'master' of https://github.com/FAIMS/gravestones

Conflicts:
	data_schema.xml