Changes for customers
Settings changes
Merge branch 'master' of https://github.com/cal5barton/cbjfmw
changes to customer and customer details
Merge branch 'master' of https://github.com/cal5barton/cbjfmw