Merge pull request #1 from cbos-team/master

checkout status quo
fixed relative path in navigation
Merge pull request #2 from dupps/master

fixed relative path in navigation