Merge branch 'StringFormatting' into small_stage_cleanup

Conflicts:
	common/Item.cpp
	world/client.cpp
	zone/net.cpp