editar perfil y filtros de anibal
editar perfil y filtros de anibal
Merge remote-tracking branch 'origin/pauliny' into pauliny

Conflicts:
	Applace/res/layout/activity_filtro.xml
	Applace/res/layout/dialog_editarperfil.xml
	Applace/src/com/retni/applacegps/Activity_perfil.java
	Applace/src/com/retni/applacegps/Fragment_listaAloj.java
	Applace/src/com/retni/applacegps/Logueado.java
cambios en mi note rosado
Merge remote-tracking branch 'origin/pauliny' into pauliny

Conflicts:
	Applace/res/layout/activity_caracteristicas.xml
	Applace/res/layout/activity_filtro.xml
	Applace/src/com/retni/applacegps/Activity_editarPerfil.java
	Applace/src/com/retni/applacegps/Activity_perfil.java
	Applace/src/com/retni/applacegps/Activity_verAlojamiento.java
	Applace/src/com/retni/applacegps/Fragment_listaAloj.java
	Applace/src/com/retni/applacegps/Fragment_mapa.java
	Applace/src/com/retni/applacegps/Fragment_mapaRuta.java
	Applace/src/com/retni/applacegps/Fragment_ubicacion.java
	Applace/src/com/retni/applacegps/Logueado.java
Google Maps

Integración de google maps a Applace. Faltan funcionalidades.
Merge remote-tracking branch 'origin/pauliny'