added mention of Epicureanism
typo
text tweak
text tweak
text tweak
tracking print
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/terms/aristotelianism.xml
	source/terms/darwinism.xml
	source/terms/hegelianism.xml
	source/terms/kantianism.xml
	source/terms/objectivism.xml
	source/terms/platonism.xml
	source/terms/socialdarwinism.xml
	source/terms/thomism.xml
Merge remote-tracking branch 'ismbook/development' into dev
Merge branch 'master' into gh-pages
Generated from v1.5.