Downgraded default build hadoop version to 1.0.4.
Merge branch 'master' of github.com:mesos/spark
Change default SPARK_HADOOP_VERSION in make-distribution.sh too
Merge branch 'master' of https://github.com/mesos/spark into master-csd

Conflicts:
	pom.xml