hasInlineMerchandise is now exposed in JS

Currently only works if the page has an ISBN number assigned.
add new im ad slot
InlineMerchandising saved to S3
hasInlineMerchandising now supports DFP targeting
Merge remote-tracking branch 'origin/master' into addingImSlotTargeting

Conflicts:
	common/app/dfp/DfpAgent.scala
Oops, left a conflict in.
Fixed configuration test
Merge pull request #5070 from guardian/addingImSlotTargeting

Adding InlineMerchandising slot targeting