Merge branch 'feature/118'

Close #118
Clean up sidebar in manual - 120
Merge pull request #121 from froschdesign/feature/manual-sidebar

Clean up sidebar in manual - 120
Merge branch 'hotfix/121' into develop

Forward port #121