merge new changes
Merge branch 'master' of github.com:stanfy/hotandroid
test fail