readme
Merge branch 'develop'
Rename CHANGELOG to CHANGELOG.md