Manchester City and the Premier League reach a settlement in their dispute over the rules that govern commercial deals.