Merge release 1.6.0

James Moger

2014-06-16 111b48c40cd2cc4e19e28c8b6af8379885fb617b

 src/main/java/com/gitblit/wicket/pages/BasePage.java

@@ -93,6 +93,13 @@
      if (app().settings().getBoolean(Keys.web.useResponsiveLayout, true)) {

         add(CSSPackageResource.getHeaderContribution("bootstrap/css/bootstrap-responsive.css"));

      }

      if (app().settings().getBoolean(Keys.web.hideHeader, false)) {

         add(CSSPackageResource.getHeaderContribution("hideheader.css"));

      }

   }



   protected String getContextUrl() {

      return getRequest().getRelativePathPrefixToContextRoot();

   }



   protected String getCanonicalUrl() {