Merge branch 'clustered-edge-index' into add_project_to_graph

Conflicts:
	graph/src/main/scala/org/apache/spark/graph/Graph.scala
	graph/src/main/scala/org/apache/spark/graph/impl/GraphImpl.scala
Reimplement Graph.mask using innerJoin