pop-up incluido
boton facebook incluido
f https://github.com/stilexmagic/foodland into tester

Conflicts:
	.DS_Store
	application/.DS_Store
	application/views/.DS_Store
vghv
Merge branch 'tester' of https://github.com/stilexmagic/foodland into tester