msg
Merge branch 'master' of github.com:TongtongLiu/tsinghuatuan

Conflicts:
	urlhandler/userpage/templates/usercenter_token.html