download form github and use for merging
delete database file and keep on local
Warehouse management for item,parcel,shipping, inventory modules
Warehouse->Inventory Category,Warehouse->Parcel Modules
Merge branch 'master' into usgm-beta-nilesh

Conflicts:
	app/Controller/CMSController.php
	app/Model/CmsSnippet.php
	app/View/Elements/admin_left_menu.ctp
Merge branch 'master' into usgm-beta-bhausaheb