updated changelog

Conflicts:
	doc/CHANGELOG.md