controller connodity tab
 function __construct 新增
 function categorySecondList 修改
 function shelvesList 新增
 function shelvesEditAdd 新增
 function onshelvesEditAdd 新增
lang backend_land
 $lang['nav_commodity_shelvesList']新增
 $lang['nav_commodity_shelvesEditAdd']新增
 $lang commodity_land']新增
 $lang['commodity_item_image']新增
 $lang['commodity_item_image_select']新增
 $lang['commodity_item_image_remove']新增
 $lang['commodity_item_image_change']新增
 $lang['commodity_item_fulltext']新增
 $lang['commodity_shelves_ErrorMsg']新增
 $lang['commodity_shelves_sale_status']新增
 $lang['commodity_shelves_stop_status']新增
models items_information
 function SelectShelves 新增
 function SelectCountWhere 新增
views invoicingLog 修改
views itemAdd 修改
views itemEdit 修改
views itemList 修改
Merge branch 'master' of github.com:vegeden/dealer

Conflicts:
	application/controllers/commodity.php
views/backend.php
 remove ckeditor.js
views/commodity/invoicingEditAdd.php 修改
views/commodity/shelvesEditAdd.php 新增
views/commodity/shelvesList.php 新增
js commodity.js 修改
controller commodity
 function shelvesList 新增
 function shelvesEditAdd 新增
 function onshelvesEditAdd 新增
model item_information
 function SelectShelves 新增
 function SelectCountWhere 新增
Merge branch 'master' of github.com:vegeden/dealer