Remove file upload edits
remove faulty repo
Properly fix jetty orbit stuff
fix orbit really, also for the example project
allow for the build server to decide the version and the cross paths
don't use -optimize as compiler option
don't use crosspaths by default
Servlet should be provided.
Clear some warnings.
Synchronize build options with develop branches.
Merge branch '2.0.x' into 2.1.x

Conflicts:
	example/src/main/scala/org/scalatra/ChatServlet.scala
	lift-json/src/main/scala/org/scalatra/liftjson/LiftJsonRequestBody.scala
	project/build.scala
	test/src/main/scala/org/scalatra/test/Reflection.scala
Upgrade Mockito. Fixes NoSuchMethodError in auth test.
Merge branch '2.0.x' into 2.1.x

Conflicts:
	project/build.scala
fix jvalue result for files
Merge branch '2.1.x' into develop_2.9
Merge branch 'develop_2.9' into develop_2.10

Conflicts:
	project/build.scala
Merge branch 'develop_2.10' of github.com:/scalatra/scalatra into develop_2.10

Conflicts:
	crosspaths.sbt
	project/build.scala