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