Fixing of "Need to be able to see which programs are approved for each retailer - only if possible!!! ".
Merge origin/master