Add a navigation and a workspace
Merge branch 'master' into dev-master