update changelog

Conflicts:
	CHANGELOG