fix api
Merge branch 'master' of github.com:binux/lixian.xunlei

Conflicts:
	libs/lixian_api.py
Merge branch 'master' of github.com:binux/lixian.xunlei
using r.content
fix #34