Dev commit from 27.3.14. Much progress on World. Fun times.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/main/scala/com/nabijaczleweli/gol/stuff/World.scala