Merge branch 'master' of github.com:Adobe/react-spectrum (#599)
* Merge branch 'master' of github.com:Adobe/react-spectrum
# Conflicts:
# src/ModalContainer/js/ModalContainer.js
* Daniel and I think this is still needed
* talked to michael jordan more, when Dialog has trapFocus={false} aria-modal be false