测试获取远端数据
Merge branch 'master' of https://github.com/BugFreeSE/tsinghuatuan
Merge branch 'master' of https://github.com/BugFreeSE/tsinghuatuan

Conflicts:
	urlhandler/userpage/templates/votedetails.html
修复Merge的Bug