Reserva
Merge branch 'master' of https://github.com/Hugogoodpeople/Menuguru

Conflicts:
	Menuguru6/app/src/main/res/layout/dialog_reserva.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/classes.j
ar

Menuguru6/libraries/facebook/build/intermediates/bundles/release/classes
.jar

Menuguru6/libraries/facebook/build/intermediates/libs/facebook-debug-tes
t.ap_
	Menuguru6/libraries/facebook/build/outputs/aar/facebook.aar