1
Merge branch 'master' of https://github.com/xmduhan/qi

Conflicts:
	qisite/qisite/urls.pyc
	qisite/qisite/wsgi.pyc
解析服务器上的返回回来的json数据