update changelog

Conflicts:
	changelog.txt