Merge pull request #40 from aptara/Gauri

Gauri
Content upload changes
Merge pull request #41 from aptara/Sushil

Sushil
Merge Rajib CSS change to Sprint 4
Merge pull request #42 from aptara/Sprint-4

Sprint 4