force java6 compatible output
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
bump version
remove ()
    change validation.fail.toOption to use a fold for compatibility with scalaz7
git rid of some unneeded imports of scalaz
Merge pull request #244 from stew/52be281ef0c64cd72883e05def784eeab3ad0858

change validation.fail.toOption to use a fold for compatibility with scalaz7
Merge pull request #245 from stew/scalaz7

git rid of some unneeded imports of scalaz
Upgrade json4s to 3.1.0.
Update Scalate to 1.6.1.

Scalate 1.6.0 was accidentally published against Java 7.  We want to
maintain Java 6 compatibility.
Merge branch '2.2.x' into 2.2.x_2.10

Conflicts:
	project/build.scala
Merge branch '2.2.x' into develop
Merge branch '2.2.x_2.10' into develop_2.10

Conflicts:
	commands/src/main/scala/org/scalatra/commands/CommandSupport.scala
Adding some docs on Swagger parameters.
Merge pull request #246 from futurechimp/develop

Adding some docs on Swagger parameters.