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

build.gradle

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

src/main/java/org/nrg/dcm/id/TemplatizedDicomFileNamer.java

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

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

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

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

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

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

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

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

...va/org/nrg/xnat/initialization/XnatWebAppInitializer.java

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

...java/org/nrg/xnat/restlet/extensions/DicomSCPRestlet.java

...n/java/org/nrg/xnat/restlet/resources/ScriptResource.java

...rg/nrg/xnat/restlet/resources/ScriptVersionsResource.java

src/main/webapp/WEB-INF/conf/orm-config.xml

src/main/webapp/WEB-INF/conf/services.properties

...main/webapp/scripts/lib/jquery-plugins/jquery.dataAttr.js

src/main/webapp/scripts/lib/spawn/spawn.js