extracted location coordinates from dataset
Fixed conflicts
Merge branch 'ToreyStapleton-master'