CHANGELOG updated
Merge branch 'master' of github.com:junkdog/artemis-odb

Conflicts:
	CHANGELOG.md