10 Nearby locations
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/www/templates/phptest.php
	app/www/templates/restaurant_menu.php