setting panel + bug fix
Merge branch 'master' of https://git@github.com/FabienInspiron/lifegame.git