Merge pull request #1 from aptara/Sprint-3-

Sprint 3
Fixed the upload file issue
Merge pull request #7 from aptara/Sushil

Sushil
Defect Fix
RE factoring the code
Merge pull request #8 from aptara/Sushil

Sushil
Merge pull request #9 from aptara/Sprint-3-

Sprint 3
Merge branch 'Sprint-3-' of https://github.com/aptara/AdvantexeAdminPortal into Gauri

Conflicts:
	Web/Views/Client/ManageClient.cshtml
Defect Fix Sprint 3
Popup
Database Script folder added
Defect Fix for Sprint 1, 2 & 3
Merge pull request #11 from aptara/Gauri

Gauri
Merge pull request #10 from aptara/Gauri

Defect Fix
Merge pull request #13 from aptara/Sprint-3-

Merge pull request #10 from aptara/Gauri
Content Popup changes
Added User Management Back end
Merge branch 'Sprint-4' of https://github.com/aptara/AdvantexeAdminPortal into rajib

Conflicts:
	Advantexe.Protal.v11.suo
	ErrorLogs/Log.txt
	Web/Advantexe.Admin.Portal.csproj
	Web/Content/Styles/styles/custom.css
	Web/Data/AdvantexeDataModel.Context.cs
	Web/Data/AdvantexeDataModel.Designer.cs
	Web/bin/Advantexe.Admin.Portal.dll
	Web/bin/Advantexe.Admin.Portal.pdb