debug
Merge branch 'master' of https://github.com/wx6/tsinghuatuan

Conflicts:
	urlhandler/userpage/static/js/vote_mainpage.js
Merge branch 'master' of https://github.com/wx6/tsinghuatuan
Merge branch 'master' of https://github.com/wx6/tsinghuatuan