temp
Merge branch 'master' of https://github.com/cbsheng/isa

Conflicts:
	book/douban/constants.py
	book/douban/manager.py