Merge branch 'master' into inventory_weight

Conflicts:
	src/Engine/Location.cpp
	src/Game/GameCritterObject.cpp
	src/Game/GameCritterObject.h
	src/Game/GameDudeObject.h
Merge branch 'master' of git://github.com/vvbalashoff/falltergeist