rewrite
typo
tracking print version
text tweaks
added Popper quotes
text tweaks
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/terms/christianity.xml
	source/terms/conceptualism.xml
	source/terms/confucianism.xml
	source/terms/cynicism.xml
	source/terms/deism.xml
	source/terms/dialecticalmaterialism.xml
	source/terms/epicureanism.xml
	source/terms/falsificationism.xml
	source/terms/feminism.xml
	source/terms/illusionism.xml
	source/terms/immoralism.xml
	source/terms/intellectualism.xml
	source/terms/kantianism.xml
	source/terms/marxism.xml
	source/terms/mysticism.xml
tracking print
tracking print
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/terms/objectivism.xml
tracking edits to print version
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/terms/pacifism.xml
	source/terms/platonism.xml
	source/terms/positivism.xml
Merge branch 'development' into name_entities