Merge branch 'master' of https://github.com/OrgCurrent/Android
Merge branch 'master' into keith