Add UpdateCompany and UpdateCustomer operations. Merged master and resolved conflict.