Added Locations, will need to parse further to get better keywords and shorten location names
Merge branch 'testbranch'