another version of CompanyDialog -- CompanyDialog2
new branch
merge new branch
workspace chnges