Add test for expiring user after 1 day.
Expire users after 1 day.
Merge branch 'feature/expire_users_after_1_day'
Merge branch 'master' into qa

Conflicts:
	app/models/user_session.rb