Fix #344 label issue
Merge branch 'master' of https://github.com/rtCamp/buddypress-media