coś
Merge branch 'master' of https://github.com/marc-inn/life

Conflicts:
	src/init/init_ui.cpp
	src/life.pro.user