Merge remote-tracking branch 'origin/master' into Try_Branching_2

build.gradle

src/main/java/org/nrg/viewer/QCImageCreator.java

.../resources/META-INF/xnat/spawner/site-admin-elements.yaml

src/main/webapp/WEB-INF/tags/page/xnat.tag

...n/webapp/page/admin/data/config/admin-manageData-tab.yaml

...ain/webapp/page/admin/data/config/site-admin-alt-new.json

src/main/webapp/page/admin/data/config/site-admin-alt.json

...in/webapp/page/admin/data/config/site-admin-resolved.yaml

.../webapp/page/admin/data/config/site-admin-sample-new.yaml

...p/page/admin/data/config/site-admin-spawner-elements.yaml

src/main/webapp/page/admin/data/config/site-admin.json

src/main/webapp/page/admin/data/config/site-admin.json.js

src/main/webapp/page/admin/data/config/siteAdmin.json

src/main/webapp/page/admin/data/config/siteAdmin.yaml

src/main/webapp/page/admin/data/config/siteAdminAlt.yaml

src/main/webapp/page/admin/fake.jsp

src/main/webapp/page/admin/spawner/content.jsp

src/main/webapp/page/admin/style.css

src/main/webapp/page/admin/tabs.js

src/main/webapp/page/admin/tabs.jsp