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

Conflicts:
	build.sbt