Funcionando com WS
Merge branch 'ws' of https://github.com/thiagofrohlich/android into ws