add merge_dup_medium_all_controversies to support web ui merge media; fix bug in spider feed generation
Merge branch 'master' into RELEASE_20130723
Merge branch 'master' of github.com:berkmancenter/mediacloud
Merge branch 'RELEASE_20130723' of github.com:berkmancenter/mediacloud into RELEASE_20130723
Merge branch 'master' into RELEASE_20130723