bug fixes in collapsed view sidebar
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
new button colors
Merge remote-tracking branch 'origin/master'