corrections
correction
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/terms/atomism.xml
Merge remote-tracking branch 'ismbook/development' into dev