Location
Merge branch 'master' of https://github.com/leonson/practicum

Conflicts:
	customer/a/VisitBranchViewController.m