localidades a lo boludo
manifest
merge
completando activities vivienda
Merge branch 'master' of https://github.com/panchipandol/android_encuestas