Changed the activity_to_json() and location_to_json() to convert into dicts instead of strings