added statistics method to ehcache
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Add JAX-RS style route builder

This route builder features:
- registration for all standard http methods
- registration of routes for multiple runtime modes
- registration of a route based on the presence of Ninja a Property
- discrete control over registration order

This route builder is used in conjunction with the standard Ninja Router.
Remove superfluous NinjaProperties parameter
Explicitly document package requirement for annotated controllers
Rename ninja-jaxrs-routes to ninja-jaxy-routes to avoid confusion
Update Jetty, Jackson, Guava, Guice, H2, ehcache, spymemcached, commons-email
added function to set html/text body from template
reset
Merge pull request #243 from gitblit/updatedeps

Update Jetty, Jackson, Guava, Guice, H2, ehcache, spymemcached, commons-...
Merge branch 'jaxrs' of github.com:gitblit/ninja into gitblit-jaxrs

Conflicts:
	ninja-core/src/site/markdown/developer/changelog.md
Merge branch 'gitblit-jaxrs' into develop
organized imports
removed methods for mail templates
Merge pull request #246 from svenkubiak/develop

Organized imports in ninja-core