some comment
Merge branch 'master' of https://github.com/thangnh0409/Android-HelloWorld
resolve conflict