Merge pull request #21 from aptara/rajib

Rajib
Merge pull request #20 from aptara/rajib

Rajib
Merge pull request #22 from aptara/master

Merge pull request #21 from aptara/rajib
Defect fixes for content and users
Added User progress logic
Merge pull request #23 from aptara/Sushil

Added User progress logic
Fixed Some issue
Merge pull request #24 from aptara/Sushil

Fixed Some issue
css changes done