Scarlett Johansson and Disney settle dispute: 'happy to have resolved our differences'

The 'Black Widow' star sued the company in July, accusing them of breaching her contract for the Marvel film