Disney and YouTube's battle for the future of TV ends in a truce after more than 2 weeks of blackout | Fortune