Update
Merge branch 'master' of https://github.com/simon-coursera/android