modified build.sbt
Merged
modified SparkApp
Webserver for UI, Streaming DStreams to WebServer
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/scala/queries/SparkJoin.scala