Merge branch 'master' into stomath

Conflicts:
	src/player.cpp
	src/player.h
	src/savegame_json.cpp
Aftermegre fixes
Fix