update to spray 1.1.2
Merge branch 'on_spray-can_1.1' into on_jetty_1.1
Merge branch 'on_jetty_1.1' into on_jetty_1.2

Conflicts:
	build.sbt