Merge branch 'master' of github.com:guardian/frontend into bacon-story-package
Merge branch 'master' of github.com:guardian/frontend into bacon-story-package
Merge branch 'bacon' of github.com:guardian/frontend into bacon-story-package
Merge branch 'master' of github.com:guardian/frontend into bacon-story-package
Put items into zone lists
Render seperate zone lists
Adding new social share icons
Merge branch 'bacon' into bacon-story-package
Start trails restyle
Spacing tweaks and refactoring
Merge remote-tracking branch 'origin/bacon' into bacon-social-icons
Pull FB App id from configuration
Fix the api calls
Don't persist or display default zonename
Hover state
Set ?view=mobile on iframe src
Merge remote-tracking branch 'origin/bacon' into bacon-social-icons

Conflicts:
	common/app/assets/images/global/sprite.png
	common/app/assets/stylesheets/theme/_global-icons-sprite.scss
Timestamps, spacing and color tweaks
Merge branch 'master' of github.com:guardian/frontend into bacon-story-package
Merge branch 'bacon' of github.com:guardian/frontend into bacon-story-package