sidebar and fixes
f
sidebar updates
Merge branch 'master' into beanshell-doppio