changelog updated
Merge branch 'master' of github.com:uikit/uikit

Conflicts:
	CHANGELOG.md