d
Merge branch 'Sprint1' of https://github.com/aptara/AdvantexeAdminPortal into Sushil
Merge branch 'Sprint1' of https://github.com/aptara/AdvantexeAdminPortal into Sushil

Conflicts:
	ErrorLogs/Log.txt
Fixed the logout issue