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

Conflicts:
	src/main/scala/com/nabijaczleweli/gol/Main.scala