Big Fixes
Merge branch 'master' of https://github.com/rtCamp/buddypress-media