Merge remote-tracking branch 'origin/master' into custom-page

.gitignore

build.gradle

...va/org/nrg/dcm/id/ScriptedSessionAssignmentExtractor.java

src/main/java/org/nrg/xapi/model/event/EventClassInfo.java

src/main/java/org/nrg/xapi/rest/JsonYamlRestValidator.java

src/main/java/org/nrg/xapi/rest/event/EventHandlerApi.java

src/main/java/org/nrg/xnat/event/conf/EventPackages.java

...org/nrg/xnat/event/entities/ScriptLaunchRequestEvent.java

...java/org/nrg/xnat/event/entities/WorkflowStatusEvent.java

...ava/org/nrg/xnat/event/listeners/AutoRunEmailHandler.java

.../org/nrg/xnat/event/listeners/AutomatedScriptHandler.java

...at/event/listeners/AutomationCompletionEventListener.java

...rg/xnat/event/listeners/AutomationEventScriptHandler.java

...rg/nrg/xnat/event/listeners/DicomToNiftiEmailHandler.java

...rg/nrg/xnat/event/listeners/PipelineEmailHandlerAbst.java

.../xnat/event/listeners/WorkflowStatusEventHandlerAbst.java

src/main/java/org/nrg/xnat/initialization/RootConfig.java

src/main/java/org/nrg/xnat/restlet/XNATApplication.java

...org/nrg/xnat/restlet/actions/AutomationBasedImporter.java

...in/java/org/nrg/xnat/restlet/resources/EventResource.java