Updates Changelog

Conflicts:
	Changelog
Updates Changelog