Sidebar Update
Merge remote-tracking branch 'Warhawk/master'