update changelog
Remove extra whitespace
Merge branch 'master' into install_create_merge

Conflicts:
	CHANGELOG.txt