The phase behaviour of colloid-polymer and colloid-colloid mixtures