Merge branch 'spray-can' of https://github.com/alexbiehl/Play20 into spray-can

Conflicts:
	framework/src/play/src/main/scala/play/core/server/SprayServer.scala
Merge branch 'spray-can' of https://github.com/alexbiehl/Play20 into spray-can