update changelog
Merge branch '1.0'

Conflicts:
	CHANGELOG.md