Merge branch 'master' into angular
fixing conflicts
Merge branch 'master' into angular
Merge pull request #3 from bchiatt/models

Models
dummy test data
Merge branch 'master' into angular
added data to events.json
Merge pull request #4 from bchiatt/kaydb

added data to events.json
Merge pull request #5 from bchiatt/models

updated models
Merge branch 'master' into angular
historic locations added
Merge branch 'master' of https://github.com/bchiatt/enlighTN
event page, loc page, locations index receiving data from mongo
merge conflict in json file resolved
Metro Installations
locations index page displaying
capitalization fixed - since my PM has an attitude problem
civic.json including galleries, theatre and museums, changed locId in events.json
unit
Metro Galleries db added