Adding a sidebar scaffold'
Merge branch 'develop'