Merge branch 'ticket/200' into develop

diff --cc .classpath
index 21432ba0b2f02104d18ff579990285672ab5fa0a,f970f85d432adab69854d0733476bdd84d670e69..4a62e82c17a6d613b821c60a41674ba5cf92838b
--- 1/.classpath
--- 2/.classpath
+++ b/.classpath
@@@ -5,18 -5,17 +5,18 @@@
        <classpathentry kind="src" path="src/test/java" output="bin/test-classes" />
        <classpathentry kind="src" path="src/test/bugtraq" output="bin/test-classes" />
        <classpathentry kind="src" path="src/main/resources" />
 -      <classpathentry kind="lib" path="ext/dagger-1.1.0.jar" sourcepath="ext/src/dagger-1.1.0.jar" />
 +      <classpathentry kind="lib" path="ext/guice-4.0-beta4.jar" sourcepath="ext/src/guice-4.0-beta4.jar" />
        <classpathentry kind="lib" path="ext/javax.inject-1.jar" sourcepath="ext/src/javax.inject-1.jar" />
 -      <classpathentry kind="lib" path="ext/dagger-compiler-1.1.0.jar" sourcepath="ext/src/dagger-compiler-1.1.0.jar" />
 -      <classpathentry kind="lib" path="ext/javawriter-2.1.1.jar" sourcepath="ext/src/javawriter-2.1.1.jar" />
 +      <classpathentry kind="lib" path="ext/aopalliance-1.0.jar" sourcepath="ext/src/aopalliance-1.0.jar" />
 +      <classpathentry kind="lib" path="ext/guava-17.0.jar" sourcepath="ext/src/guava-17.0.jar" />
 +      <classpathentry kind="lib" path="ext/guice-servlet-4.0-gb1.jar" sourcepath="ext/src/guice-servlet-4.0-gb1.jar" />
        <classpathentry kind="lib" path="ext/annotations-12.0.jar" sourcepath="ext/src/annotations-12.0.jar" />
        <classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
 -      <classpathentry kind="lib" path="ext/slf4j-api-1.7.5.jar" sourcepath="ext/src/slf4j-api-1.7.5.jar" />
 -      <classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.5.jar" sourcepath="ext/src/slf4j-log4j12-1.7.5.jar" />
 +      <classpathentry kind="lib" path="ext/slf4j-api-1.7.7.jar" sourcepath="ext/src/slf4j-api-1.7.7.jar" />
 +      <classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.7.jar" sourcepath="ext/src/slf4j-log4j12-1.7.7.jar" />
        <classpathentry kind="lib" path="ext/javax.mail-1.5.1.jar" sourcepath="ext/src/javax.mail-1.5.1.jar" />
        <classpathentry kind="lib" path="ext/javax.servlet-api-3.1.0.jar" sourcepath="ext/src/javax.servlet-api-3.1.0.jar" />
-       <classpathentry kind="lib" path="ext/jetty-all-9.2.2.v20140723.jar" sourcepath="ext/src/jetty-all-9.2.2.v20140723.jar" />
+       <classpathentry kind="lib" path="ext/jetty-all-9.2.3.v20140905.jar" sourcepath="ext/src/jetty-all-9.2.3.v20140905.jar" />
        <classpathentry kind="lib" path="ext/wicket-1.4.21.jar" sourcepath="ext/src/wicket-1.4.21.jar" />
        <classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.21.jar" sourcepath="ext/src/wicket-auth-roles-1.4.21.jar" />
        <classpathentry kind="lib" path="ext/wicket-extensions-1.4.21.jar" sourcepath="ext/src/wicket-extensions-1.4.21.jar" />

diff --cc build.moxie
index 965ecde8421f59774bc7fe5a79ed74e63a696c8a,41a6f19809c55c1d25181b66bdb22f5ec60080dd..d0282003255d801e111c27c53d819053b860af04
--- 1/build.moxie
--- 2/build.moxie
+++ b/build.moxie
@@@ -102,11 -102,11 +102,11 @@@ repositories: central, eclipse-snapshot
  
  # Convenience properties for dependencies
  properties: {
-   jetty.version  : 9.2.2.v20140723
+   jetty.version  : 9.2.3.v20140905
    wicket.version : 1.4.21
 -  lucene.version : 4.6.0
 +  lucene.version : 4.10.0
    jgit.version   : 3.5.0.201409260305-r
 -  groovy.version : 1.8.8
 +  groovy.version : 2.3.3
    bouncycastle.version : 1.49
    selenium.version : 2.28.0
    wikitext.version : 1.4

diff --cc gitblit.iml
Simple merge