something committed
Merge branch 'master' of https://github.com/kornicameister/LakeSISE

Conflicts:
	src/main/resources/data/tt_forester.properties
	src/main/resources/data/tt_poacher.properties
	src/main/resources/lake.properties
Merge branch 'master' of https://github.com/kornicameister/LakeSISE

Conflicts:
	src/main/resources/data/tt_forester.properties
	src/main/resources/data/tt_poacher.properties
	src/main/resources/lake.properties
updated
Merge branch 'master' of https://github.com/kornicameister/LakeSISE