Pre comment merge commit
Merge branch 'master' of https://github.com/rtCamp/buddypress-media
Bug Fix for static function warning