Merge pull request #21 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
done
Merge pull request #25 from aptara/rajib

Rajib
Added User Progress SQL logic
Added required css
Merge branch 'Sprint-4' of https://github.com/aptara/AdvantexeAdminPortal into Sushil

Conflicts:
	Web/Advantexe.Admin.Portal.csproj
	Web/Common/Utility.cs
	Web/Controllers/User/UserDashboardController.cs
	Web/Data/AdvantexeDataModel.Context.cs
	Web/Data/AdvantexeDataModel.edmx
	Web/Data/Business/UserManager.cs
	Web/Models/User.cs
	Web/Views/UserDashboard/UserDashboard.cshtml
Added missing files
done
Merge pull request #29 from aptara/Sprint-4

Added missing files
Merge branch 'Sprint-4' of https://github.com/aptara/AdvantexeAdminPortal into Sushil
Build errors
User Progress changes
Merge pull request #30 from aptara/Sushil

Sushil