Update email promo with new CIF email name
Fixes layout issue where an ad is placed above a figure
Added a test to cover the figure element scenario
Limiting the number of inline ads that can be rendered
Refactored test
Container type error
Popular component styling type error
Show comment bubble on live trail items
Show more button is next to the text on iOS6
Comment count is appended to the correct fromage template part
Force correct text rendering on fromage title
Merge pull request #2818 from guardian/most-popular-spacing

Most popular spacing
Merge pull request #2823 from guardian/fix-show-more-ios6

Show more button: icon is closer to the text on iOS6
Fix Ethical awards confirmation sentence
Refactored to remove growing number of ad placement rules

Now placing the ad before the target paragraph. This means we don't
have to worrry about what comes after the paragraph, i.e. h2 or figure
Merge pull request #2821 from guardian/live-card-comment-bubble

Show comment bubble on live trail items
alpha opt in visible to 50% users
deleted article from gruntfile
Merge pull request #2828 from guardian/increase-alpha-opt-in

Alpha opt in now visible to 50% users
delete failing test