检查并删掉todos
Merge branch 'rebuild' of github.com:WeijuNB/jizhang_us into rebuild

Conflicts:
	models.py
	server.py