Merge pull request #371 from folone/master

core/src/main/scala/spark/CacheTracker.scala

core/src/main/scala/spark/MapOutputTracker.scala

core/src/main/scala/spark/api/java/function/Function.java

core/src/main/scala/spark/api/java/function/Function2.java

...in/scala/spark/api/java/function/PairFlatMapFunction.java

.../src/main/scala/spark/api/java/function/PairFunction.java

core/src/main/scala/spark/deploy/JsonProtocol.scala

core/src/main/scala/spark/deploy/client/Client.scala

core/src/main/scala/spark/deploy/master/Master.scala

core/src/main/scala/spark/deploy/master/MasterWebUI.scala

core/src/main/scala/spark/deploy/worker/Worker.scala

core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala

core/src/main/scala/spark/network/ConnectionManager.scala

.../src/main/scala/spark/network/ConnectionManagerTest.scala

.../spark/scheduler/cluster/StandaloneSchedulerBackend.scala

core/src/main/scala/spark/storage/BlockManager.scala

core/src/main/scala/spark/storage/BlockManagerMaster.scala

...rc/main/scala/spark/storage/BlockManagerMasterActor.scala

core/src/main/scala/spark/util/AkkaUtils.scala

core/src/test/scala/spark/CacheTrackerSuite.scala