Merge branch 'master' into MainUI
"grabbing the latest from Maura on dialogs that was merged int master from Maura UI"
Merge branch 'master' into MainUI
"Actually merging with Maura's code this time"
Merge branch 'mauraUI' into MainUI