Stomach
Stupid mistake fix
Fix one stupid mistake.
Merge branch 'master' into stomath

Conflicts:
	src/player.cpp
	src/player.h
	src/savegame_json.cpp
Aftermegre fixes
Fix
Merge pull request #8419 from Reaper42/stomath

Stomach