优化了登陆逻辑和session过期时间
Merge remote-tracking branch 'origin/master'

Conflicts:
	transport/views.py