First commit
layout styles updated
nav
navigation examples
Merge branch 'dev'
fix merge conflict
fix merge conflict