fixed activity and buddy cell
up
qwer
sd
up
Merge remote-tracking branch 'origin/master'