Beginning work on rich html layout
Merge branch 'master' of https://github.com/Financial-Times/ft-navigation
Git went dodgy whilst I tried to pull down new code so have had to perform a merge - hope I'm not breaking anything - there should be no new code from me