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

.gitignore

build.gradle

src/main/java/org/nrg/xapi/rest/theme/ThemeApi.java

...ain/java/org/nrg/xnat/configuration/SerializerConfig.java

src/main/java/org/nrg/xnat/configuration/ThemeConfig.java

...rg/nrg/xnat/event/listeners/PipelineEmailHandlerAbst.java

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

...n/java/org/nrg/xnat/restlet/resources/SecureResource.java

...java/org/nrg/xnat/restlet/services/AliasTokenRestlet.java

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

...ain/java/org/nrg/xnat/services/impl/ThemeServiceImpl.java

...main/java/org/nrg/xnat/turbine/modules/screens/Index.java

...main/java/org/nrg/xnat/turbine/modules/screens/Login.java

.../nrg/xnat/turbine/modules/screens/UploadAppletScreen.java

...nat/turbine/modules/screens/XDATScreen_admin_options.java

...g/nrg/xnat/turbine/modules/screens/XDATScreen_themes.java

src/main/java/org/nrg/xnat/utils/SerializerService.java

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