adding to the changelog
Merge branch 'origin/develop'

Conflicts:
	CHANGELOG