Renaming to CHANGELOG for cross sdk consistency
Merge branch 'master' into nin