updated Changelog
Merge branch 'develop'