CleverRaven/Cataclysm-DDA — pull request #3465 by GalenEvil (2013-10-05 09:28:54+00:00)
Title: Names & Parrot JSON raw->json conversion

Moved names.json to data/json. Not entirely sure why the diff is so weird on it.
Renamed parrot.json during move to migo_speech.json (makes more sense?).
Added JsonObject loading function, removed old code and references to the old code.
Did test to see if the names.json diff could be fixed by changing where the "type" member is located, seems that it just doesn't care. Maybe related to all entries being only one line each?