Added CHANGELOG
Merge branch 'master' into plugins