Updated the CHANGELOG.md file
Merge branch 'build' of github.com:hyyan/bedrock into build