integrate changelog
Merge branch 'release-0.4.0.0'

Conflicts:
	ChangeLog.md
Tweak change log for the release again