Release 2.2.2.
More release notes.
Merge branch '2.2.2_2.9' into 2.2.2_2.10
Bump to 2.2.3-SNAPSHOT.
Merge branch '2.2.x_2.9' into 2.2.x_2.10
Merge branch '2.2.x_2.10' into 2.3.x_2.10

Conflicts:
	version.sbt
Release notes for 2.3.0.M1.
Release 2.3.0.M1.
Revert to 2.3.0-SNAPSHOT.
edit release notes
fixes needed for jetty 9
wip
some adjustments for running tests etc on jetty 9
uncomment fileupload specs
re-enable scalatra-jetty and update servlet-api
re-enables scalatra-fileupload
minor tweak in old fileuploadsupporttest
Merge pull request #341 from scalatra/jetty-9

Jetty 9
target java 7
Add render callbacks to the correct collection