commit from githuub
merged
company & users edit,save dialog fixs //DONE