Remove echo from template
Merge branch 'master' of https://github.com/rtCamp/buddypress-media
Fix activity and comment sync issue
Merge branch 'master' of https://github.com/rtCamp/buddypress-media