Update CHANGELOG.md
Update README.md
Merge remote-tracking branch 'upstream/master' into mifosplatform-1.1.0