civic.json including galleries, theatre and museums, changed locId in events.json
fixed merge conflicts in two json files
Merge pull request #9 from bchiatt/kaydb

civic.json including galleries, theatre and museums, changed locationId in ev...