dialogs work
dialogs fixes. userdata fixes
merge develop changes