Merge remote-tracking branch 'origin/scala-2.11-akka-2.3.2-migration'
into mergeMigrationToClusterConfig3

Conflicts:
	src/main/scala/com/signalcollect/DefaultGraph.scala
	src/main/scala/com/signalcollect/configuration/AkkaConfig.scala
	src/main/scala/com/signalcollect/configuration/KryoInit.scala
	src/main/scala/com/signalcollect/factory/worker/Akka.scala
	src/main/scala/com/signalcollect/nodeprovisioning/DefaultNodeActor.scala
	src/main/scala/com/signalcollect/nodeprovisioning/Node.scala
	src/main/scala/com/signalcollect/nodeprovisioning/local/LocalNodeProvisioner.scala
	src/main/scala/com/signalcollect/util/AkkaRemoteAddress.scala
	src/main/scala/com/signalcollect/worker/AkkaWorker.scala
	src/main/scala/com/signalcollect/worker/WorkerImplementation.scala
	src/test/scala/com/signalcollect/features/ComputationTerminationSpec.scala
Merge branch 'mergeMigrationToClusterConfig3' into mergeClusterConfig3toClusterconfig

Conflicts:
	src/main/scala/com/signalcollect/DefaultGraph.scala
	src/main/scala/com/signalcollect/configuration/AkkaConfig.scala
	src/main/scala/com/signalcollect/configuration/KryoInit.scala
	src/main/scala/com/signalcollect/factory/worker/Akka.scala
	src/main/scala/com/signalcollect/interfaces/Node.scala
	src/main/scala/com/signalcollect/node/DefaultNodeActor.scala
	src/main/scala/com/signalcollect/nodeprovisioning/local/LocalNodeProvisioner.scala
	src/main/scala/com/signalcollect/util/AkkaRemoteAddress.scala
	src/main/scala/com/signalcollect/worker/AkkaWorker.scala
	src/main/scala/com/signalcollect/worker/WorkerImplementation.scala
	src/test/scala/com/signalcollect/features/ComputationTerminationSpec.scala