Content Search Fixes
Merge branch 'Sprint-5' of https://github.com/aptara/AdvantexeAdminPortal into Gauri

Conflicts:
	ErrorLogs/Log.txt
Merge pull request #119 from aptara/Gauri

Gauri
User Bulk Upload changes
Merge pull request #120 from aptara/Gauri

User Bulk Upload changes
Css changes 6.37
Merge pull request #121 from aptara/rajib

Css changes 6.37
Merge pull request #122 from aptara/Sprint-5

Sprint 5