Updated from upstream master
Removed unwanted document...
Amended claim_notification method to enable it to send to Users as well as ExternalAuthors.
Amended import to include users as well as external authors.
Reinstated collection-related prompts.
Added handling to create a valid new user.
Corrected import URL so redirects will work
Moved all the 852-specific code into the mass_import file at shalott's request.
Removed hard-coded webdev path and personal email address.
Added new text version of claim_notification view and merged user_mailer with the one in master.
fix trap plugin to prevent infinite loop
Merge pull request #1202 from tuff-ghost/issue_3380e

3380e: fix trap plugin to prevent infinite loop
3371 Fix JS on maintenance page where livequery is not included
Merge pull request #1203 from sarken/issue_3371

3371 Fix JS on maintenance page where livequery is not included
change modal setup code to hide in-page modal content rather than remove it from the DOM
Merge pull request #1204 from tuff-ghost/issue_3380f

2066 & 3380: hide in-page modal content rather than removing it
3293 footer escapes wrapper
Merge pull request #1207 from sarken/issue_3293

3293 footer escapes wrapper
Adding JSON gem patch
Merge pull request #1209 from elzj/json_patch

Adding JSON gem patch