Tabs from article page
Merge branch 'master' of https://github.com/guardian/frontend into id-account-profile

* 'master' of https://github.com/guardian/frontend: (28 commits)
  delete failing test
  deleted article from gruntfile
  alpha opt in visible to 50% users
  Fix Ethical awards confirmation sentence
  Force correct text rendering on fromage title
  Comment count is appended to the correct fromage template part
  Show more button is next to the text on iOS6
  Show comment bubble on live trail items
  adding data-link-name attr to anchors
  Don't cap the title width when image is highlighted on desktop
  Popular component styling type error
  Container type error
  Spacing tweaks
  Fix agent starting up as app closes down
  indentation fix
  Display comment count in fromage top story template
  create container show more code - shows items in page
  Update copy on Film and Ethical awards complete pages
  Style Formstack character count
  Put AB tests in new javascript
  ...
implemented tabs using pre-existing tabs framework
Roberto's changes
Realign icons in a 18x18px square
New mobile logo
New Desktop logo
Remove Top Stories dropdown menu
Move search to popup menu on mobile
Update sprite
New header look & feel
Merge branch 'master' of github.com:guardian/frontend into navigation-quick-wins

Conflicts:
	common/app/assets/stylesheets/theme/_global-icons-sprite.scss
	common/app/assets/stylesheets/theme/_global-icons-svg.scss
	common/app/views/fragments/header.scala.html
Remove old search popup code and add desktop search section
Merge branch 'master' of github.com:guardian/frontend into navigation-quick-wins
Style local nav, search bar and editions on desktop
Remove search blue state
Merge branch 'master' of github.com:guardian/frontend into navigation-quick-wins
Merge branch 'master' of github.com:guardian/frontend into navigation-quick-wins
Merge branch 'master' of github.com:guardian/frontend into navigation-quick-wins
Navigation design change