Merge branch 'master' of git://github.com/rtCamp/buddypress-media.git
Merge branch 'master' of git://github.com/rtCamp/buddypress-media.git
Merge git://github.com/rtCamp/buddypress-media
Renamed the uploader bg image
Merge pull request #198 from hrishiv90/master

Renamed uploader background image
Disabled Activity Stream Upload
Fixed Settings error for atleast one media type and enabling of buddypress media
Merge pull request #199 from joshuaabenazer/master

Fixed Settings error for atleast one media type and enabling of buddypress media
preparing for pull
Merge branch 'master' of https://github.com/rtCamp/buddypress-media
finished disabling media types functionality
Fixed tab highlighting on groups>
Added group disabling functionality
Minor Fixes and Group Media Activity implementation
Merge branch 'master' of github.com:rtCamp/buddypress-media
Merge pull request #200 from joshuaabenazer/master

Minor Fixes
replaced bg image on uploader
Added Filetring for media files display list
Added filter to remove last media file
Fixed the ajax load more issue
Merge pull request #201 from hrishiv90/master

Add filter to display one less media file
Fixed the uploader UI issue in groups