Merge branch 'master' of git://github.com/rtCamp/buddypress-media.git
Merge branch 'master' of git://github.com/rtCamp/buddypress-media.git
Merge pull request #197 from joshuaabenazer/master

Activity Stream Upload
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