Fix Branch, Customer, Staff,
Merge remote-tracking branch 'origin/master'