Fixed empty query error
fixed merge conflicts
Merge branch 'rtMedia-backbone' of https://github.com/rtCamp/buddypress-media into rtMedia-backbone
added tinyMCE for description