waiting for
Merge branch 'master' of github.com:eikehartmann/game-of-life-xt
Merge remote-tracking branch 'origin/master'
gridactor grid update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/scala/gofxt/messaging/GridActor.scala