Updating Changelog
Merge from master

Conflicts:
	CHANGELOG.markdown