Update changelog

Conflicts:
	CHANGELOG.md