Merge pull request #1 from faerindel/dialogs

[WIP] Dialogs