corrections
Remapped version numbers.

v1.2 is now v1.1
v1.2.1 is now v1.1.1
v1.3 is now v1.1.2
v1.3.1 is now v1.1.3
v1.3.2 is now v1.1.4.
correction
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/terms/atomism.xml
Merge remote-tracking branch 'ismbook/development' into dev
Merge branch 'master' into gh-pages
Generated from v1.2.