Merge pull request #145 from aptara/Gauri

Gauri
Fix merge issue
Merge pull request #147 from aptara/Sushil

Fix merge issue
Added Emails
Merge pull request #149 from aptara/Sushil

Added Emails
css changes
Merge pull request #151 from aptara/Sushil

css changes
css changes
Merge pull request #153 from aptara/Sushil

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

CSS Changes done
Merge branch 'Sprint-5' of https://github.com/aptara/AdvantexeAdminPortal into Gauri

Conflicts:
	Web/Scripts/common.js
	Web/Views/UserDashboard/UserProfile.cshtml