Merge branch 'master' into servlets
-rw-r--r-- 2102 .classpath
-rw-r--r-- 84 .gitignore
-rw-r--r-- 1218 .project
drwxr-xr-x - .settings
drwxr-xr-x - META-INF
drwxr-xr-x - WEB-INF
-rw-r--r-- 24602 build.xml
drwxr-xr-x - conf
drwxr-xr-x - datadb
drwxr-xr-x - doc
drwxr-xr-x - engine
drwxr-xr-x - log
drwxr-xr-x - server
drwxr-xr-x - testsrc
drwxr-xr-x - website