Added CHANGELOG.md
Merge branch 'development'