Client Report Export
Merge pull request #184 from aptara/Sushil

Client Report Export
Export Functionlity File Name changes
Merge branch 'Sprint-5' of https://github.com/aptara/AdvantexeAdminPortal into Gauri

Conflicts:
	Web/obj/Debug/Advantexe.Admin.Portal.csproj.FileListAbsolute.txt
entity changes
Merge pull request #186 from aptara/Sushil

entity changes
Bulk Upload UI Changes
Merge branch 'Sprint-5' of https://github.com/aptara/AdvantexeAdminPortal into Gauri

Conflicts:
	Web/Data/AdvantexeDataModel.edmx
Merge pull request #188 from aptara/Gauri

Gauri
Reset entites
Merge pull request #190 from aptara/Sushil

Reset entites
Merge branch 'Sprint-5' of https://github.com/aptara/AdvantexeAdminPortal into rajib

Conflicts:
	Web/Views/AdvantexeReport/ClientReport.cshtml