Merge branch 'future'

Conflicts:
	build.sbt
	src/main/scala/ChordController.scala
	src/main/scala/ChordState.scala
	src/main/scala/Stabilizer.scala
	src/main/scala/idAddress.scala
	src/main/scala/stabilizationStrategies.scala
	src/main/scala/successorStabilizationFactory.scala
	src/test/scala/TnodeIDSpec.scala
Merge branch 'master' of github.com:windymelt/p2pScalaProto