Popup dialogs and misc updates
Merge branch 'master' of github.com:liquidthex/cannaroom