Merge branch 'master' into develop
Merge pull request #96 from ksslng/small-fixes

Search fix + privacy policy
Merge branch 'pr/87' into develop

Conflicts:
	view_controllers/OBASearchResultsMapViewController.m
Handle merge conflict for 'No stops at this location'

Sorry, this was caused by me for merging PRs in a poor order.
fix merge
try a second time before showing alert
merge conflict fix
Merge remote-tracking branch 'ksslng/error-connecting' into multiregion