Trying to fix some bugs. Work in progress.
Merge branch 'dev' into feature-world-comfort

Conflicts:
	world.json
a little bit more comfortable region matrix description implemented
Merge branch 'feature-world-comfort' into dev