Fixes the xml deserialization to jvalue to skip the root element
Prepares for 2.1.0 release
tweaks to release notes for 2.1.0
fix #215 re-adds InputStream into the render pipeline
bump version
Use any instead of anyref for an attributes map
merge from develop
bump to rc3
bump to rc3, update release notes and fix noNulls
go back to snapshot version
use rl 0.4.1 and akka 2.0.5
Revert "Use any instead of anyref for an attributes map"

Save API changes for 2.2.x.

This reverts commit eca1ad2e449593d74213c0ffbbb434c8b8764b5c.
Merge branch '2.1.x' into 2.2.x

Conflicts:
	README.markdown
	core/src/main/scala/org/scalatra/ScalatraBase.scala
	core/src/test/scala/org/scalatra/ActionResultsSpec.scala
	lift-json/src/main/scala/org/scalatra/liftjson/LiftJsonSupport.scala
	lift-json/src/test/scala/org/scalatra/liftjson/LiftJsonRequestBodySpec.scala
	project/build.scala
Bump to SBT 0.12.1.
Remove deprecated Scala Tools repo.

Was only needed for 2.8.2, which is no longer supported.
Name the default servlet "default".  Fixes #248.
Merge branch '2.1.x' into 2.2.x

Conflicts:
	project/build.scala
	test/src/main/scala/org/scalatra/test/JettyContainer.scala
Merge branch '2.2.x' into develop