七牛
Merge remote-tracking branch 'origin/master'

Conflicts:
	Apps/Common/Common/function.php
	ORG/qiniu/qiniu.class.php