Conflicts:
	ec2/deploy.generic/root/mesos-ec2/ec2-variables.sh

Get more env vars from driver rather than worker

For standalone mode, get JAVA_HOME, SPARK_JAVA_OPTS, SPARK_LIBRARY_PATH from application env, not worker env

Refactor Kryo serializer support to use chill/chill-java

Fix setting of SPARK_EXAMPLES_JAR

Stage Page updates

Building spark assembly for further consumption of the Spark project with a deployed cluster

Add metrics system for Spark

Conflicts:

	core/src/main/scala/spark/SparkContext.scala
	core/src/main/scala/spark/SparkEnv.scala

Conflicts:

	core/src/main/scala/spark/SparkContext.scala
	core/src/main/scala/spark/SparkEnv.scala