Dev commit from 26.3.14
Merge remote-tracking branch 'origin/dev' into dev

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