Vistas planapp

generarhoy, generarpanorama
Merge branch 'master' of github.com:PlanApp/android

Conflicts:
	PlanApp/bin/PlanApp.apk
	PlanApp/bin/classes.dex
	PlanApp/bin/classes/com/example/planapp/MainRegistrar.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/resources.ap_
	PlanApp/gen/com/example/planapp/R.java
	PlanApp/res/layout/activity_main_registrar.xml