Merge pull request #84 from snordt/master

generalize the add_json_fields.py script and timeline code clean-up
moved active content to data repo, changes to timeline and other file clean-up