Merge pull request #387 from guardian/football

Added FA cup and League cup to fixtures component list
Fixed top-stories jasmine tests
Merge branch 'master' of github.com:guardian/frontend
Testing whether in memory filtering of content types is faster.

MBS reckons Core-Nav, Tag and Section content api queries will drop to sub 100ms (down from 300ms) if we do in memory filtering instead of putting the content type tags in the query.

This will prove or disprove.
Testing whether in memory filtering of content types is faster.

MBS reckons Core-Nav, Tag and Section content api queries will drop to sub 100ms (down from 300ms) if we do in memory filtering instead of putting the content type tags in the query.

This will prove or disprove.
Testing whether in memory filtering of content types is faster.

MBS reckons Core-Nav, Tag and Section content api queries will drop to sub 100ms (down from 300ms) if we do in memory filtering instead of putting the content type tags in the query.

This will prove or disprove.
Merge pull request #390 from guardian/go-faster-stripes

Testing whether in memory filtering of content types is faster.
Changed order of football competitions