Update ChangeLog

Conflicts:
	ChangeLog