update
Merge branch 'RichardTestBranch' of https://github.com/davedwards/AndroidClass into RichardTestBranch