A diplomatic dispute between the two most influential Asian nations is coming to an end. Japan is releasing the captain of a Chinese fishing boat captain who was detained after his ship collided with Japanese coastguards earlier this month.