Merge branch 'Propiedades-Viviendas-'

Conflicts:
	app/src/main/AndroidManifest.xml

app/src/main/java/co/gov/fna/vivienda/controlador/ControladorTimelineAct
ivity.java

app/src/main/java/co/gov/fna/vivienda/presentacion/actividades/MyActivit
y.java

app/src/main/java/co/gov/fna/vivienda/presentacion/actividades/Time.java

app/src/main/java/co/gov/fna/vivienda/presentacion/actividades/TimelineA
ctivity.java
	app/src/main/java/co/gov/fna/vivienda/servicios/GetRestServices.java