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

.gitignore

build.gradle

...ava/org/nrg/dcm/id/RoutedStudyDicomProjectIdentifier.java

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

src/main/java/org/nrg/pipeline/XnatPipelineLauncher.java

src/main/java/org/nrg/xapi/model/users/User.java

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

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

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

...ava/org/nrg/xdat/om/base/BaseArcArchivespecification.java

.../om/base/BaseArcArchivespecificationNotificationType.java

.../java/org/nrg/xdat/om/base/BaseArcFieldspecification.java

src/main/java/org/nrg/xdat/om/base/BaseArcPathinfo.java

src/main/java/org/nrg/xdat/om/base/BaseArcPipelinedata.java

...va/org/nrg/xdat/om/base/BaseArcPipelineparameterdata.java

src/main/java/org/nrg/xdat/om/base/BaseArcProject.java

...n/java/org/nrg/xdat/om/base/BaseArcProjectDescendant.java

...rg/nrg/xdat/om/base/BaseArcProjectDescendantPipeline.java

...ain/java/org/nrg/xdat/om/base/BaseArcProjectPipeline.java

src/main/java/org/nrg/xdat/om/base/BaseArcProperty.java