Added buddy sidebar
Merge commit