update
Merge branch 'master' of https://github.com/niranjan94/android-dev-guide