Changed toolbar (again) for AddLocationViewController
Merge remote-tracking branch 'origin'