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

lib/javax.annotation.jar

lib/javax.ejb.jar

lib/javax.jms.jar

lib/javax.persistence.jar

lib/javax.resource.jar

lib/javax.servlet.jar

lib/javax.servlet.jsp.jar

lib/javax.servlet.jsp.jstl.jar

lib/javax.transaction.jar

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

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

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

...in/java/org/nrg/xnat/initialization/PropertiesConfig.java

.../java/org/nrg/xnat/preferences/AutomationPreferences.java

...org/nrg/xnat/restlet/actions/AutomationBasedImporter.java

src/main/java/org/nrg/xnat/services/XnatAppInfo.java

...nrg/xnat/turbine/modules/actions/AcceptProjectAccess.java

...ources/META-INF/xnat/preferences/notifications.properties

src/main/webapp/setup/site-setup.yaml