some change
Merge https://github.com/carterh062/PilotPhillyProject

Conflicts:
	LocationListViewController.m