cambiando librerias
cambiando librerias
Merge remote-tracking branch 'origin/eduardo' into eduardo

Conflicts:
	Applace/project.properties
Merge remote-tracking branch 'origin/pauliny' into eduardo
Merge remote-tracking branch 'origin/master' into eduardo
cambios en iconos

se agregaron iconos a activity_veralojamiento
cambios con iconos

asdasdasdasd
Merge remote-tracking branch 'origin/eduardo' into pauliny