modernize build
add branches for 2.11
Merge branch 'on_spray-can_1.1' into on_jetty_1.1

Conflicts:
	project/plugins.sbt
upgrade to latest xsbt-web-plugin
Merge branch 'on_jetty_1.1' into on_jetty_1.2