World of Warcraft to return to China

China's NetEase and games publisher Activision Blizzard end their feud which had angered fans.