Location view reintegrated. More clues added
Merge branch 'master' of https://github.com/sukhada/15239
Clues added