Update changelog

Conflicts:
	src/Changelog