parameterized toolbar component
Merge branch 'develop' into feature/exercise-intro