Added changelog.md file
Merge branch 'develop'