add merging instructions
update to spray RC2
Update to RC2

Merge branch 'on_spray-can_1.1' into on_jetty_1.1
update to RC2

Merge branch 'on_jetty_1.1' into on_jetty_1.2

Conflicts:
	build.sbt