good
Merge branch 'master' of https://github.com/jimpepe/Android
oct 16 afternoon test