Merge branch 'master' into rpc

diff --cc docs/00_index.mkd
index 079bc3d3d11e7c0c7f9d231ed7990ad054d5f37a,cf165db5a7dca950d06668d05d2a7bbdfd715666..f5820cb6e97b4ef7d739132f29905df80bf5b6fc
--- 1/docs/00_index.mkd
--- 2/docs/00_index.mkd
+++ b/docs/00_index.mkd
@@@ -27,16 -26,11 +27,17 @@@ Gitblit requires a Java 6 Runtime Envir
  \r
  ### Current Release\r
  \r
 -**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)) based on [%JGIT%][jgit]   *released %BUILDDATE%*\r
 +**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)|[rpcclient](http://code.google.com/p/gitblit/downloads/detail?name=%RPCCLIENT%)) based on [%JGIT%][jgit]   *released %BUILDDATE%*\r
  \r
 -- improved: updated ui with Twitter's Bootstrap CSS toolkit\r
 +- improved: overhauled web ui with Twitter's Bootstrap CSS toolkit\r
  <br/>**New:** *web.loginMessage = gitblit*\r
 +- added: authenticated JSON RPC mechanism \r
 +<br/>**New:** *web.enableRpcServlet = true*\r
 +<br/>**New:** *web.enableRpcAdministration = false*\r
 +- added: reusable JSON RPC client class\r
 +- added: Swing RPC Client application for cloning and administration of repositories, users, and federation proposals.\r
 +- fixed/broke: federation protocol.  dates are now serialized to the [iso8601](http://en.wikipedia.org/wiki/ISO_8601) standard.  This breaks 0.6.0 federation clients/servers.\r
+ - fixed: Gitblit now runs on Servlet 3.0 webservers (e.g. Tomcat 7, Jetty 8)\r
  - fixed: Set the RSS content type for Firefox 4 (issue 22)\r
  - fixed: Null pointer exception if did not set federation strategy (issue 20)\r
  - fixed: Gitblit GO allows SSL renegotiation if running on Java 1.6.0_22 or later\r

diff --cc docs/04_releases.mkd
index 10ef2bb9ba4f922bbf420f36f6f5828597fd81ee,214e35cb5aea983b3960db4dc6626b84eebdec70..3eaba405e2b763d6ef40177f372ff4460f79756d
--- 1/docs/04_releases.mkd
--- 2/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@@ -1,17 -1,12 +1,18 @@@
  ## Release History\r
  \r
  ### Current Release\r
 -**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)) based on [%JGIT%][jgit]   *released %BUILDDATE%*\r
 +**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)|[rpcclient](http://code.google.com/p/gitblit/downloads/detail?name=%RPCCLIENT%)) based on [%JGIT%][jgit]   *released %BUILDDATE%*\r
  \r
 -- improved: updated ui with Twitter's Bootstrap CSS toolkit\r
 +- improved: overhauled web ui with Twitter's Bootstrap CSS toolkit\r
  <br/>**New:** *web.loginMessage = gitblit*\r
 -- fixed: Set the RSS content type for Firefox 4 (issue 22)\r
 +- added: authenticated JSON RPC mechanism \r
 +<br/>**New:** *web.enableRpcServlet = true*\r
 +<br/>**New:** *web.enableRpcAdministration = false*\r
 +- added: reusable JSON RPC client class\r
 +- added: Swing RPC Client application for cloning and administration of repositories, users, and federation proposals.\r
 +- fixed/broke: federation protocol.  dates are now serialized to the [iso8601](http://en.wikipedia.org/wiki/ISO_8601) standard.  This breaks 0.6.0 federation clients/servers.\r
+ - fixed: Gitblit now runs on Servlet 3.0 webservers (e.g. Tomcat 7, Jetty 8)\r
 +- fixed: Set the RSS content type for Firefox 4 (issue 22)
  - fixed: Null pointer exception if did not set federation strategy (issue 20)\r
  - fixed: Gitblit GO allows SSL renegotiation if running on Java 1.6.0_22 or later\r
  - added: IUserService.setup(IStoredSettings) for custom user service implementations\r

diff --cc src/com/gitblit/build/Build.java
Simple merge