Merge branch 'dryad-master' into dryad-staging
atmire-1987 : response-logging : exclude DSpace 1.8 dependencies from inclusion into dryad build
Merge branch 'fix_reviewer_emails' into dryad-staging
Merge branch 'atmire-1987' into dryad-staging
atmire-1987 remove filter to allow response logging override to be used.
Merge branch 'atmire-1987' into dryad-staging
Merge pull request #402 from datadryad/institutional-sponsors

Institutional Sponsors page (and nav), with CHON
Merge branch 'institutional-sponsors' into dryad-staging
Merge branch 'dryad-master' into dryad-staging
Merge branch 'dryad-master' into dryad-staging

Conflicts:
	dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/cocoon/DSpaceCocoonServletFilter.java
Merge remote-tracking branch 'origin/atmire-1920' into dryad-staging

Conflicts:
	dspace/modules/xmlui/src/main/webapp/i18n/messages.xml
Remove extra clause that refers to undefined variable
Merge branch 'dryad-master' into dryad-staging
Merge branch 'dryad-master' into dryad-staging
Merge branch 'trello-44-logging' into dryad-staging
Merge branch 'dryad-master' into dryad-staging
Revert "atmire-1691"

atmire-1691 broke journal config parsing

This reverts commit 827af23da356397437815b8b72e3f9319981e29a.
Merge branch 'trello-44-logging' into dryad-staging
Merge branch 'dryad-master' into dryad-staging
Merge branch 'trello-44-logging' into dryad-staging