Updated Clients feature and customer and retail client events
Merge remote-tracking branch 'origin/master'