atmire-1694 : Encoding of fee waiver countries
Merge remote-tracking branch 'origin/atmire-1694' into dryad-staging
Correct character encoding of countries
Standardized currency display for all pages
Standardized currency symbols in initial page text
Converted US$ => $ in initial page text.
Merge remote-tracking branch 'origin/integrated-journals-table' into dryad-staging

Conflicts:
	dspace/modules/xmlui/src/main/webapp/themes/Mirage/pages/integratedJournals.xhtml
Correct span error
Added payment plan info, new journals
Merge pull request #333 from laurawendell/patch-17

Added payment plan info, new journals
Add temp workaround for link to My Submissions page
Correct header for Pub Blackout
Reword reauthorization heading
Merge remote-tracking branch 'origin/atmire-1869' into dryad-staging

Conflicts:
	dspace/modules/xmlui/src/main/webapp/themes/Mirage/lib/js/dryad-pages.js