Code

merge of dialog and impl classes of ocaldialogs