Warcraft will return to China, the world’s biggest video game market, as Microsoft-owned Blizzard and NetEase make up after a year-long feud