Merged changes from Tim's plugin development with latest main line development.

Merge commit '37317f9f'

# Conflicts:
#	.gitignore
#	build.gradle
#	src/main/java/org/nrg/xdat/om/base/BaseXnatDicomseries.java
#	src/main/java/org/nrg/xdat/om/base/BaseXnatExperimentdata.java
#	src/main/java/org/nrg/xdat/om/base/BaseXnatImageassessordata.java
#	src/main/java/org/nrg/xdat/om/base/BaseXnatImagescandata.java
#	src/main/java/org/nrg/xdat/om/base/BaseXnatImagesessiondata.java
#	src/main/java/org/nrg/xdat/om/base/BaseXnatProjectdata.java
#	src/main/java/org/nrg/xdat/om/base/BaseXnatPublicationresource.java
#	src/main/java/org/nrg/xdat/om/base/BaseXnatPvisitdata.java
#	src/main/java/org/nrg/xdat/om/base/BaseXnatReconstructedimagedata.java
#	src/main/java/org/nrg/xdat/om/base/BaseXnatResource.java
#	src/main/java/org/nrg/xdat/om/base/BaseXnatResourcecatalog.java
#	src/main/java/org/nrg/xdat/om/base/BaseXnatResourceseries.java
#	src/main/java/org/nrg/xdat/om/base/BaseXnatSubjectdata.java