Added customer name as a confi setting entry
Merge remote-tracking branch 'origin/master' into prod