1
2
Merge remote-tracking branch 'origin/master'
12_02/1 - buddies menu