controllers commodity.php
 private function oninvoicingEditAdd 修改
models items_information.php
 public function DelCheck 修改
views backend.php 修改
view commodity shelvesEditAdd.php 修改
js commodity.js
 shelvesEditAdd.php 新增
statics js lib ckeditor/新增
statics js lib ckfinder/新增
Merge branch 'master' of github.com:vegeden/dealer

Conflicts:
	application/views/backend.php
backend SysSetting.php新增
lang SysSetting_lang.php 新增
lang backend_lang.php 新增
model SysConfig.php 新增
views/backend/SysSetting/ACL.php 新增
views/backend/SysSetting/SysConfigAdd.php新增
views/backend/SysSetting/SysConfigEdit.php
views/backend/SysSetting/_formSysConfig.php新增
views/backend/SysSetting/index.php 新增
views/backend/_footer.php 新增
views/backend/_header.php 新增
views/backend/_main_top.php 新增
views/backend/_nav.php 新增
views/backend/account/levelEdit.php 新增
views/backend/account/levelList.php 新增
views/backend_article.php 新增
views/backend_nav.php 新增
views/index.php 新增
gitignore 修改
remove Thumbs.db
Merge branch 'master' of github.com:vegeden/dealer

Conflicts:
	application/views/backend/_header.php