Cap the notification number to 10, displaying 10+ if over
Merge pull request #24 from Financial-Times/iconfix

nailed down o-ft-icons dependency to get the right font
Merge pull request #25 from Financial-Times/iconfix2

changed to v2.2.3 for icons (v2.3.x conflicts with something!)
Update next-user-preferences
Merge pull request #23 from Financial-Times/cap-notification-number

Cap the notification number to 10, displaying 10+ if over
Update bower versions
Merge branch 'gh-pages' of https://github.com/Financial-Times/next-header into gh-pages

Conflicts:
	bower.json
Merge branch 'master' into flags

* master:
  Update bower versions
  Update next-user-preferences
  Cap the notification number to 10, displaying 10+ if over

Conflicts:
	main.js