Underline auto-generated tag links
Update email promo with new CIF email name
Replace the old news container with the new
Remove old mixins and restore spacing between item images and top tone border
Spacing between standfirst and meta is more robust
Merge branch 'news-container-tweaks' of github.com:guardian/frontend into replace-news-container

Conflicts:
	common/app/assets/stylesheets/module/containers/_top-stories.scss
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
Breaking news. Dialog box refactor.
Merge branch 'master' into facia-tool-breakingnews
Refactored test
Merge branch 'master' of github.com:guardian/frontend into replace-news-container

Conflicts:
	common/app/assets/stylesheets/module/containers/_top-stories.scss
Add 'breaking' to model, templates
User defined font size does not break the layout
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
deleted article from gruntfile
delete failing test
Use 'isBreaking' rather than 'breaking'