Merge pull request #230 from aptara/Sushil

Resolve the merge conflicts
CSS Commited
CSS COMIT
Merge pull request #232 from aptara/rajib

Rajib
Merge pull request #234 from aptara/Sprint-5

Sprint 5