Merge pull request #29 from pradpnayak/RG-108

--updated all files, for RG-108
Merge pull request #30 from pradpnayak/RG-108

--updated tpl files
Merge pull request #31 from pradpnayak/RG-108

--added 2 files RG-108
--more work on RG-108