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

build.gradle

src/main/resources/META-INF/xnat/init_security_000.sql

src/main/webapp/WEB-INF/conf/InstanceSettings.xml

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

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

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

src/main/webapp/images/nav_more_light.png

src/main/webapp/images/subnav_more_light.png

src/main/webapp/images/xnat-nav-logo-white-lg.png

src/main/webapp/scripts/globals.js

...n/webapp/scripts/lib/jquery-plugins/jquery.maskedinput.js

...bapp/scripts/lib/jquery-plugins/jquery.maskedinput.min.js

src/main/webapp/scripts/lib/jquery-plugins/jquery.spawn.js

src/main/webapp/scripts/lib/jquery/jquery.js

src/main/webapp/scripts/lib/jquery/jquery.min.js

src/main/webapp/scripts/lib/jquery/jquery.min.map

src/main/webapp/scripts/lib/loadjs/loadjs.js

src/main/webapp/scripts/lib/loadjs/loadjs.min.js

src/main/webapp/scripts/lib/spawn/spawn.html

src/main/webapp/scripts/lib/spawn/spawn.js