tracking edits to print version
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/terms/pacifism.xml
	source/terms/platonism.xml
	source/terms/positivism.xml