Merge origin/master

Conflicts:
	app/controllers/GuestsController.php
	app/controllers/RestaurantsController.php
	app/views/guests/checkouts.blade.php
	app/views/guests/view_customer.blade.php