Dev commit from 28.03.14
Dev commit from 29.3.14
Merge branch 'dev' of https://github.com/nabijaczleweli/Scala-Game-of-Life into dev