China and Japan have had a long-standing prickly relationship.  In more recent years, this has been exacerbated by the dispute between the two countries over the Senkaku islands. That being