added album checks in query
refactored media query
Merge branch 'rtMedia-backbone' of https://github.com/rtCamp/buddypress-media into rtMedia-backbone