force java6 compatible output
Port to Scala 2.10.
Alphabetize formats so we can see what's there.
text/plain -> txt in ApiFormats
Note cross build for Scala 2.10.
Get Lift dependencies off snapshots.
Merge branch '2.0.x' into 2.1.x

Conflicts:
	project/build.scala
	project/plugins.sbt
Fix Lift dependencies for earlier builds.
Merge branch '2.0.x' into 2.1.x

Conflicts:
	project/build.scala
Merge branch '2.1.x' into 2.2.x

Conflicts:
	core/src/main/scala/org/scalatra/ApiFormats.scala
	project/build.scala
	project/plugins.sbt
Merge branch '2.2.x' into 2.2.x_2.10

Conflicts:
	core/src/main/scala/org/scalatra/ApiFormats.scala
Merge branch '2.2.x' into develop
Merge branch '2.2.x_2.10' into develop_2.10
Merge branch 'develop' into develop_2.10