ALM-613 store document id of history documents in CouchDB
ALM-613 don't store history information in CouchDB history documents
ALM-614 drop retrieval_histories table and all references
ALM-653 removed dependencies on retrieval_histories table
ALM-652 updated v3 Api to no longer use retrieval_histories
ALM-653 fixed tests
ALM-652 fixed tests
ALM-652 fix tests
ALM-613 adjust test to confirm we stored ids of history documents
Merge branch 'release/v.2.13' into develop
Merge branch 'develop' of github.com:articlemetrics/alm into feature/ALM-657

Conflicts:
	app/views/report_mailer/send_status_report.html.erb
	app/views/report_mailer/send_status_report.text.erb
	docs/api.md
	spec/apis/v3/articles_spec.rb
	spec/apis/v5/articles_cache_spec.rb
	spec/factories/default.rb
	spec/factories/public.rb
Merge branch 'master' into develop

* master: (420 commits)
  minor version bump
  Fixed test that checks merging of reports. Closes #55.
  different approach to merge reports #55
  remove original column when merging in extra report
  fix chef openssl installation
  Tagged version 3.1
  remove unnecessary begin block
  updated documentation
  Catch JSON parsing errors in v4 API
  ALM-669 adjusted to changes in output of rake task
  Merging in changes from pull request #57
  ALM-669 fix html filter
  ALM-671 titleize author names
  ALM-671
  ALM-670 updated nokogiri and mini-portile
  ALM-670 using older version of sass-rails gem
  ALM-670 upgraded spring gem
  ALM-670 updated net-ssh gem
  ALM-670 updated cucumber and cucumber-rails gems
  ALM-670 updated dalli and d3_rails gems
  ...

Conflicts:
	app/controllers/api/v3/articles_controller.rb
	app/controllers/api/v5/status_controller.rb
	app/decorators/retrieval_status_decorator.rb
	app/models/retrieval_history.rb
	app/models/retrieval_status.rb
	app/models/sources/twitter_search.rb
	db/schema.rb
	lib/source_job.rb
	spec/apis/v3/articles_cache_spec.rb
	spec/lib/source_job_spec.rb
	spec/models/article_spec.rb
	spec/models/filter_spec.rb
	spec/models/retrieval_status_spec.rb
ALM-653 renamed database migration to remove dependencies from retrieval_histories
ALM-652 small changes to bring code in sync with more recent ALM 3.1 code
updated Gemfile.lock
deleted obsolete rake task
Merge branch 'master' into develop

* master:
  Rename CrossRef again #59.
  Rename CrossRef again #59.
  Another CrossRef factory name change #59.
  Another CrossRef factory name change #59.
  Further name changes of CrossRef factory #59.
  Changed name of factory for CrossRef #59.
  Small change for #59.
  Use OpenURL API if CrossRef password is missing
  Fixed long-standing typo in source name #59.
  Updated test #59.
  made test independent of month length
  Changed how we check for a publisher DOI #59
  Chnage storing of CouchDB rev in History class #60

Conflicts:
	spec/models/history_spec.rb
ALM-653 don't create CouchDB history document
ALM-653 fixed test
ALM-652 remove references to retrieval_histories from v3 API