diff --git a/.gitignore b/.gitignore
index 20bc3e8c..e721c211 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 .svn/*
 */logs/log*
 /web.config
-/kcfinder/upload/
-/kcfinder/cache/
+/kcfinder/upload/*
+/kcfinder/cache/*
+*/cache/*
+
diff --git a/kcfinder/conf/config.php b/kcfinder/conf/config.php
deleted file mode 100644
index d82e143d..00000000
--- a/kcfinder/conf/config.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/** This file is part of KCFinder project
-  *
-  *      @desc Base configuration file
-  *   @package KCFinder
-  *   @version 3.12
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://opensource.org/licenses/GPL-3.0 GPLv3
-  *   @license http://opensource.org/licenses/LGPL-3.0 LGPLv3
-  *      @link http://kcfinder.sunhater.com
-  */
-
-/* IMPORTANT!!! Do not comment or remove uncommented settings in this file
-   even if you are using session configuration.
-   See http://kcfinder.sunhater.com/install for setting descriptions */
-
-$_CONFIG = array(
-
-
-// GENERAL SETTINGS
-
-    'disabled' => false, //是否启用
-    'uploadURL' => "upload",
-    'uploadDir' => "", //文件夹管理目录
-    'theme' => "default",//主题
-
-    'types' => array(
-		'default'=>'4sj4837Rjk37L',//默认站点，设置一个怎么也猜不到的后缀
-		'ah'=>'*mime image/gif image/png image/jpeg', //这个名称就是目录名，每个站点不同
-		'gm'=>'*mime image/gif image/png image/jpeg',
-		'vac'=>'*mime image/gif image/png image/jpeg', 		
-		'vc'=>'*mime image/gif image/png image/jpeg', 
-		'it'=>'*mime image/gif image/png image/jpeg', 
-		'ru'=>'*mime image/gif image/png image/jpeg', 
-		'jp'=>'*mime image/gif image/png image/jpeg', 
-		
-		
-    // (F)CKEditor types
-       // 'files'   =>  "",
-      //  'flash'   =>  "swf",
-      //  'images'  =>  "*mime image/gif image/png image/jpeg",
-
-    // TinyMCE types
-       // 'file'    =>  "",
-      //  'media'   =>  "swf flv avi mpg mpeg qt mov wmv asf rm",
-      //  'image'   =>  "*img",
-    ),
-
-
-// IMAGE SETTINGS
-
-    'imageDriversPriority' => "gmagick gd imagick",
-    'jpegQuality' => 80,
-    'thumbsDir' => ".thumbs",
-
-    'maxImageWidth' => 0,
-    'maxImageHeight' => 0,
-
-    'thumbWidth' => 100,
-    'thumbHeight' => 100,
-
-    'watermark' => "",
-
-
-// DISABLE / ENABLE SETTINGS
-
-    'denyZipDownload' => true,//是否禁止打包下载
-    'denyUpdateCheck' => true,//是否禁止检测升级
-    'denyExtensionRename' => true,//是否禁止重命名文件后缀
-
-
-// PERMISSION SETTINGS
-
-    'dirPerms' => 0755, //创建的文件夹权限 windows下可以忽略
-    'filePerms' => 0644,//新文件权限
-
-    'access' => array(
-
-        'files' => array(
-            'upload' => true,
-            'delete' => true,
-            'copy'   => true,
-            'move'   => true,
-            'rename' => true
-        ),
-
-        'dirs' => array(
-            'create' => true,
-            'delete' => false,
-            'rename' => true
-        )
-    ),
-//禁止操作的文件后缀
-    'deniedExts' => "exe com msi bat cgi pl php phps phtml php3 php4 php5 php6 py pyc pyo pcgi pcgi3 pcgi4 pcgi5 pchi6 asp aspx zip rar",
-
-
-// MISC SETTINGS
-//文件名字符串替换
-    'filenameChangeChars' => array(
-        ' ' => "_",
-        ':' => "_"
-    ),
-
-    'dirnameChangeChars' => array(
-        ' ' => "_",
-        ':' => "_"
-    ),
-
-    'mime_magic' => "",
-
-    'cookieDomain' => "",
-    'cookiePath' => "",
-    'cookiePrefix' => 'KCFINDER_',
-
-
-// THE FOLLOWING SETTINGS CANNOT BE OVERRIDED WITH SESSION SETTINGS
-
-    '_normalizeFilenames' => false, //特殊字符替换为下划线
-    '_check4htaccess' => true,
-    //'_tinyMCEPath' => "/tiny_mce",
-
-    '_sessionVar' => "KCFINDER",
-    //'_sessionLifetime' => 30,
-    //'_sessionDir' => "/full/directory/path",
-    //'_sessionDomain' => ".mysite.com",
-    //'_sessionPath' => "/my/path",
-
-    //'_cssMinCmd' => "java -jar /path/to/yuicompressor.jar --type css {file}",
-    //'_jsMinCmd' => "java -jar /path/to/yuicompressor.jar --type js {file}",
-
-);
-
-
-
-
-?>
\ No newline at end of file