Merge pull request #122 from yapapaya/master

More Commenting
Merge pull request #126 from yapapaya/master

Merge Conflicts resolution
Added textbox field to settings api and minor modification to radio field
Merge pull request #127 from joshuaabenazer/master

Added textbox field to settings api and minor modification to radio field