updated CHANGELOG

Conflicts:
	CHANGELOG