remove unused task
map unmapped task
Trim story count on headline container
Merge pull request #5560 from guardian/headline-container-trim

Trim story count on headline container
Delete unused feature fragments
Add test for video as main media
Change padding-top on containers globally
add encoding property to video asset
Use a video profile for poster images and for flash player dimensions
Article test with correct number of videos
Merge pull request #5549 from guardian/missing-grunt-tasks

Map unmapped grunt task
Merge pull request #5562 from guardian/video-embed-bad-encoding

Handle embedded video with bad mime type
whitespace clean up
Merge pull request #5564 from guardian/design-snags

[Design snags] Change padding-top on containers globally
promoting facia video element so it gets mouse events
Rename profile support file
Merge pull request #5565 from guardian/video-profiles

Video profiles
endslate style fixes
Merge branch 'master' of github.com:guardian/frontend into facia-video-mousefix

* 'master' of github.com:guardian/frontend:
  Rename profile support file
  whitespace clean up
  Article test with correct number of videos
  Use a video profile for poster images and for flash player dimensions
  Add test for video as main media
  Delete unused feature fragments

Conflicts:
	common/app/views/fragments/items/baguette.scala.html
Update guss-typography to 2.0.1