Make asyncTimeout overridable.
Merge branch '2.1.x' into develop_2.9

Conflicts:
	akka/src/main/scala/org/scalatra/akka/AkkaSupport.scala
Merge branch 'develop_2.9' into develop_2.10