Merged xnatdev/xnat-web into master

src/main/webapp/WEB-INF/conf/log4j.properties

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

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

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

src/main/webapp/page/home/index.jsp

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

src/main/webapp/page/spawn/index.jsp

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

src/main/webapp/xnat-templates/layouts/Viewer.vm

src/main/webapp/xnat-templates/navigations/DefaultTop.vm

...main/webapp/xnat-templates/navigations/XNATQuickSearch.vm

...xnat-templates/screens/xnat_projectData/actionsBox/Add.vm