API
Merge branch 'master' of https://github.com/berkmancenter/mediacloud
Merge branch 'master' into jobs_daemon_ui_add_default_feeds