Merge remote-tracking branch 'upstream/master' into phases

Conflicts:
	player.cpp
Fixed typo
Fixed crafting of drinks
Merge branch 'phases'