pushLocationView action added to segue to Location choosing view
Merge remote-tracking branch 'origin'