Implemented new o-ft-header
Updated header and solved merge conflicts
Merge pull request #9 from Financial-Times/new-header

New header