Logo上传
fix
Merge branch 'master' of ssh://github.com/yuhang2/cms_ci

Conflicts:
	application/controllers/admin/cake.php