Merge branch 'master' of https://github.com/i-am-the-slime/SparkPlayingField

Conflicts:
	build.sbt
	src/main/scala/org/menthal/Event.scala