China and Australia spent much of last year in a tense standoff on trade. But as the recovery of the world's second largest economy gathers pace, China needs more iron ore and Australia is still its main supplier.