Updated b21 in CHANGES.md
Update version in build.xml to b21
Merge remote-tracking branch 'origin/master' into pickid