Merge pull request #114 from soulmachine/master

A little revise for the document

(cherry picked from commit 662ee9f3216e670e9582861fda92648d5abc51e1)
Signed-off-by: Reynold Xin <rxin@apache.org>
Merge pull request #111 from kayousterhout/ui_name

Properly display the name of a stage in the UI.

This fixes a bug introduced by the fix for SPARK-940, which
changed the UI to display the RDD name rather than the stage
name. As a result, no name for the stage was shown when
using the Spark shell, which meant that there was no way to
click on the stage to see more details (e.g., the running
tasks). This commit changes the UI back to using the
stage name.

@pwendell -- let me know if this change was intentional

(cherry picked from commit 85e2cab6f68cbcb66bb348298463e2e86591d92d)
Signed-off-by: Reynold Xin <rxin@apache.org>
Merge pull request #113 from pwendell/master

Improve error message when multiple assembly jars are present.

This can happen easily if building different hadoop versions. Right now it gives a class not found exception.
(cherry picked from commit e018f2d0ae826b682dda30c1ecfb0c51ad7edf58)

Signed-off-by: Patrick Wendell <pwendell@gmail.com>