Merge branch 'master' of https://github.com/rtCamp/buddypress-media
More Commenting
Merge pull request #122 from yapapaya/master

More Commenting
Merge branch 'master' of https://github.com/joshuaabenazer/buddypress-media
Fixed Merge Conflicts
Fixing Merge Conflicts
Merge pull request #126 from yapapaya/master

Merge Conflicts resolution
Added textbox field to settings api and minor modification to radio field