Tokyo Overtaken as World's Biggest City