add smart link helpers for org scope and options; added links to navigation
Merge branch 'master' of github.com:phoenix-scitent/okm