Increment version to 1.0.3 an update CHANGELOG.
Increment version to 1.0.4.
Merge branch '1.0.x'

Conflicts:
	CHANGELOG
	src/com/daveoxley/cbus/Version.tmpl