commit ui change and session
ui change and session
Merge branch 'master' of https://github.com/sctravel/scTravel_staging

Conflicts:
	.idea/workspace.xml