Halle Berry, Olivier Martinez and Gabriel Aubry Settle Dispute