Alert messages are added for User Profile
Defect fixes
4
Merge pull request #147 from aptara/Sushil

Fix merge issue
Defect Fix
Defect Fixes
Merge pull request #149 from aptara/Sushil

Added Emails
Merge pull request #151 from aptara/Sushil

css changes
Merge pull request #153 from aptara/Sushil

css changes
CSS Changes done
Merge pull request #155 from aptara/rajib

CSS Changes done
Defect Fixes
all commited
committed css
Merge branch 'Gauri' of https://github.com/aptara/AdvantexeAdminPortal into Gauri

Conflicts:
	Advantexe.Protal.v11.suo
	ErrorLogs/Log.txt
	Web/bin/Advantexe.Admin.Portal.dll
	Web/bin/Advantexe.Admin.Portal.pdb
	Web/obj/Debug/Advantexe.Admin.Portal.csproj.FileListAbsolute.txt
	Web/obj/Debug/Advantexe.Admin.Portal.dll
	Web/obj/Debug/Advantexe.Admin.Portal.pdb
	Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Web/obj/Debug/edmxResourcesToEmbed/Data/AdvantexeDataModel.csdl
	Web/obj/Debug/edmxResourcesToEmbed/Data/AdvantexeDataModel.msl
Merge branch 'Sprint-5' of https://github.com/aptara/AdvantexeAdminPortal into Gauri

Conflicts:
	Web/Scripts/common.js
	Web/Views/UserDashboard/UserProfile.cshtml
Merge pull request #157 from aptara/Gauri

Gauri
changes commited
Merge branch 'Sprint-5' of https://github.com/aptara/AdvantexeAdminPortal into rajib

Conflicts:
	Advantexe.Protal.v11.suo
	Web/obj/Debug/Advantexe.Admin.Portal.csproj.GenerateResource.Cache
	Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge pull request #159 from aptara/rajib

Rajib