Updated changelog.

Conflicts:
	CHANGELOG.md