Releasing 2.5.4
Merge branch 'master' of https://github.com/rtCamp/buddypress-media