Merge branch 'dryad-master' into dryad-dev
Merge branch 'journal-config' into dryad-dev
Merge branch 'dryad-master' into dryad-dev
Update test config for BMC journals
Update BMC parser to allow BMC's two levels of keywords
Merge branch 'bmc-updates' into dryad-dev
Fix: delete item from solr index and reversion
Enable integration for JOPHD.
Add citation to JDAP Page in Dryad theme

fogbugz 6189
Update names for all PLOS journals
Merge remote-tracking branch 'origin/email-article-type' into dryad-dev
Update PLOS capitalization
Merge branch 'dryad-master' into dryad-dev
Merge branch 'dryad-master' into dryad-dev
Merge branch 'dryad-master' into dryad-dev
Merge remote-tracking branch 'origin/atmire-1446-27' into dryad-dev

Conflicts:
	dspace/modules/xmlui/src/main/webapp/themes/Mirage/Mirage.xsl
Merge branch 'ryan-theme-cleanup-11' into dryad-dev
Fix: last 30 days datafiles is 0, add the most downloaded datapackage
Fix: last 30 days datafiles is 0, add the most downloaded datapackage
Fix: table title style