test
Merge branch 'locationDetail' of github.com:amler/simple-safari into locationDetail