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

Conflicts:
	src/common/Lair.hpp
	src/common/Tree.hpp
	src/common/Visitor.cpp
	src/common/Visitor.hpp
	src/common/Waterhole.hpp