Merge branch 'master' of https://bitbucket.org/xnatdev/xnat-web into arcSpecToPrefs

build.gradle

src/main/java/org/nrg/dcm/DicomSCPManager.java

...tions/EnabledDICOMReceiverWithDuplicatePortException.java

src/main/java/org/nrg/dcm/preferences/DicomSCPInstance.java

...main/java/org/nrg/dcm/preferences/DicomSCPPreference.java

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

...java/org/nrg/xapi/model/event/EventHandlerFilterInfo.java

src/main/java/org/nrg/xapi/rest/dicomscp/DicomSCPApi.java

...in/java/org/nrg/xapi/rest/dicomscp/DicomSCPApiAdvice.java

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

...ava/org/nrg/xapi/rest/notifications/NotificationsApi.java

src/main/java/org/nrg/xapi/rest/settings/SiteConfigApi.java

src/main/java/org/nrg/xapi/rest/theme/ThemeApi.java

src/main/java/org/nrg/xapi/rest/users/UsersApi.java

src/main/java/org/nrg/xnat/archive/GradualDicomImporter.java

...in/java/org/nrg/xnat/configuration/ApplicationConfig.java

...in/java/org/nrg/xnat/configuration/DicomImportConfig.java

src/main/java/org/nrg/xnat/configuration/FeaturesConfig.java

.../java/org/nrg/xnat/configuration/NotificationsConfig.java

src/main/java/org/nrg/xnat/configuration/OrmConfig.java