Changelog updated

Conflicts:
	HISTORY.md