geolocalizacion

se agrega la geolocalización y la guarda en una varible
Merge branch 'master' of https://github.com/PlanApp/android

Conflicts:
	PlanApp/bin/PlanApp.apk
	PlanApp/bin/classes.dex
	PlanApp/bin/classes/com/example/planapp/MainGenPanorama.class
	PlanApp/bin/classes/com/example/planapp/MainGenerarHoy$1.class
	PlanApp/bin/classes/com/example/planapp/MainGenerarHoy.class
	PlanApp/bin/classes/com/example/planapp/MainLogin$1.class
	PlanApp/bin/classes/com/example/planapp/MainLogin$2.class
	PlanApp/bin/classes/com/example/planapp/MainLogin.class
	PlanApp/bin/classes/com/example/planapp/MainRegistrar.class
	PlanApp/bin/classes/com/example/planapp/Main_panorama.class
	PlanApp/bin/classes/com/example/planapp/Main_panoramas.class
	PlanApp/bin/classes/com/example/planapp/R$attr.class
	PlanApp/bin/classes/com/example/planapp/R$dimen.class
	PlanApp/bin/classes/com/example/planapp/R$drawable.class
	PlanApp/bin/classes/com/example/planapp/R$id.class
	PlanApp/bin/classes/com/example/planapp/R$layout.class
	PlanApp/bin/classes/com/example/planapp/R$menu.class
	PlanApp/bin/classes/com/example/planapp/R$string.class
	PlanApp/bin/classes/com/example/planapp/R$style.class
	PlanApp/bin/classes/com/example/planapp/R.class
	PlanApp/bin/resources.ap_
	PlanApp/gen/com/example/planapp/R.java
	PlanApp/project.properties