Change to hierarchical navigation.
Add classes to top level navigation items and style global navigation to accommodate subpages.
Merge branch 'navigation' into develop
Merge branch 'develop' into modules