Made minor convention-related changes to merged SOLAddLocationViewController.