1642 : File size discrepancy
Changed special announcement and "upon submission"
Merge pull request #325 from laurawendell/patch-14

Changed special announcement and "upon submission"
Correct capitalization of PhytoKeys
Merge branch 'dryad-master' of github.com:datadryad/dryad-repo into dryad-master

Conflicts:
	dspace/modules/xmlui/src/main/webapp/themes/Mirage/pages/pricing.xhtml

Also tweaked some text on Pricing page.
More text tweaks for Pricing page (from Staging)
Adding "watering can" slide (DPC) slide
Improve error message for processing action
Revert "Improve error message for processing action"

This reverts commit 34f4de71af74737af735c53823c9d997811c3ec7. It
wouldn't compile, because the WorkflowException doesn't support chaining.
fix typo
took out one linebreak
Merge pull request #330 from laurawendell/patch-16

took out one linebreak
Add configuration for Scientific Data
Merge branch 'dryad-master' into dryad-staging

Conflicts:
	dspace/modules/xmlui/src/main/webapp/themes/Mirage/pages/pricing.xhtml
Add configuration for journal subscriptions
Merge branch 'dryad-master' into dryad-staging
Merge remote-tracking branch 'origin/atmire-1694' into dryad-staging
Correct character encoding of countries
1868 : Currencies not being transmitted to PayPal
Standardized currency display for all pages