remove a TODO, it is done in deploy branch
Merge branch 'master' into deploy

Conflicts:
	web/api/douban.py