auto merge last samples changes
Merge branch 'master' of https://github.com/stanfy/hotandroid