Session Manager
Merge remote-tracking branch 'origin/ReadyToPublish' into ReadyToPublish

Conflicts:
	app/src/main/res/layout/log_in.xml