use 'proposition' type main navigation
update licensing subnavigation
remove category titles, remove services page feature flag
merge master into navigation
fix erroneous copy
merge master into navigation
highlight 'services' link on fco pages
Merge pull request #97 from alphagov/navigation

Navigation