fixed counter
Merge branch 'master' of https://github.com/rtCamp/buddypress-media
Fixed conflict with Activity Plus
Merge pull request #132 from yapapaya/master

A couple of Bug Fixes