Merge remote-tracking branch 'origin/master'

build.gradle

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

src/main/java/org/nrg/user/daos/UserDAO.java

src/main/java/org/nrg/user/entities/User.java

src/main/java/org/nrg/user/services/UserService.java

...rg/user/services/impl/hibernate/HibernateUserService.java

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

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

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

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

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

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

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

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

...ain/java/org/nrg/xnat/configuration/PrearchiveConfig.java

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

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

...main/java/org/nrg/xnat/configuration/SchedulerConfig.java

...ain/java/org/nrg/xnat/configuration/SerializerConfig.java

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