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

Conflicts:
	src/common/Config.hpp
	src/life.pro.user