Updated ChangeLog

Conflicts:

	ChangeLog.txt