asSA

asAs
asdasd

asdasdas
Merge branch 'oscar'sadasd

asdasd
sdads

asdasddsdasd
Merge branch 'master' into oscar

Conflicts:
	bin/Okeda.apk
	bin/classes.dex
	bin/resources.ap_
	src/co/gov/fna/okeda/modelo/entidades/Vivienda.java
	src/co/gov/fna/okeda/utilidades/Utilities.java
zx<x

z<x<zx
adsdsadsa

asd
n

nkln
asdasda

sdasda
asdasd

asdasd
sdaddas
asdasd

sadasd
sadd

asda
dsad

asdasd
SharedPreference

Agregamos Preferencias
Ignore

GitIgnore Addes
Activity Mostrar

Resuelto Incidencia
Merge branch 'oscar'