Merge branch 'spray-wip-IO' into wip-IO-TcpConnectionActors

Conflicts:
	akka-io/src/main/scala/akka/io/Tcp.scala
	akka-io/src/main/scala/akka/io/TcpManager.scala
	akka-io/src/main/scala/akka/io/TcpOutgoingConnection.scala
	akka-io/src/test/scala/akka/io/TcpConnectionSpec.scala