deploy
Merge branch 'master' of github.com:limijiaoyin/kuzhanggui-upload

Conflicts:
	qiniu_service/qiniu_service/settings.py