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

.../java/org/nrg/xnat/helpers/prearchive/PrearcDatabase.java

.../projectResource/extensions/ProjectPermissionsFilter.java

...ava/org/nrg/xnat/restlet/resources/files/DIRResource.java

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

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

src/main/webapp/page/admin/data/config/site-setup.yaml

src/main/webapp/page/admin/spawner/spawner-admin.js

src/main/webapp/scripts/xmodal-v1/xmodal.js

src/main/webapp/scripts/xnat/spawner.js

src/main/webapp/scripts/xnat/ui/panel.js

src/main/webapp/setup/index.jsp

src/main/webapp/xdat-templates/navigations/powered_by.vm