Cambio para shared preference del login
Merge branch 'master' into AndonyNS
ListView flotante sobre el mapa, version inicial
Merge branch 'master' into AndonyNS

Conflicts:
	Buses/app/src/main/java/com/example/busdevelop/buses/RutasActivity.java
	Buses/app/src/main/res/layout/activity_rutas.xml