added sidebar
Merge branch 'staging'