Merge branch 'master' into master-json

assembly/pom.xml

assembly/src/main/assembly/assembly.xml

core/pom.xml

core/src/main/scala/spark/Cache.scala

core/src/main/scala/spark/Partitioner.scala

core/src/main/scala/spark/Utils.scala

core/src/main/scala/spark/api/python/PythonPartitioner.scala

core/src/main/scala/spark/api/python/PythonRDD.scala

...src/main/scala/spark/api/python/PythonWorkerFactory.scala

core/src/main/scala/spark/broadcast/HttpBroadcast.scala

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

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

...c/main/scala/spark/deploy/master/ui/ApplicationPage.scala

core/src/main/scala/spark/deploy/master/ui/IndexPage.scala

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

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

core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala

...main/scala/spark/executor/StandaloneExecutorBackend.scala