Location List View Controller (Without deleting)
Merge remote-tracking branch 'origin/master'
small change