Asset fixes
Merge branch 'master' of github.com:CruGlobal/nav-prototypes into nav-options
Merge pull request #16 from CruGlobal/nav-options

Nav options
Merge branch 'master' of github.com:CruGlobal/nav-prototypes into gh-pages