changing call in all creatives
Merge branch 'master' into commercial-capimulti
getting multi component correct
Merge branch 'master' into commercial-capimulti
correcting timestamp positions
ensuring old and new DFP template fields will work
removing commented out code
adding maps to simplify DFP template
manual merge
tidying of debug page
changing modifiers and class names
removing redundent container--merchandising-feature class
simplyfying scala variable calls
tidying up of old class names
class name tidy up
Merge pull request #7288 from guardian/commercial-capimulti

Adding options for commercial capi multi component