Connection between spark and cassandra not yet working
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Application.scala
	public/javascripts/graph.js