old core
Product category done admin
all upload ashesh
New uploads
iso
Merge branch 'Ashesh' of https://github.com/dixanta/stock_photo into Ashesh

Conflicts:
	app/controllers/admin--/backup admin/giftcards.php
	app/controllers/admin--/backup admin/migrate.php
	app/controllers/admin--/backup admin/orders.php
	app/controllers/admin--/backup admin/products.php
	app/controllers/admin--/backup admin/settings.php
	app/controllers/admin--/backup admin/wysiwyg.php
	app/core/MY_Controller.php
	app/views/admin/admin part/banner/index.php
	app/views/admin/admin part/category/category.php
	app/views/admin/admin part/category/index.php
	app/views/admin/admin part/country/country_zone_area_form.php
	app/views/admin/admin part/country/country_zone_areas.php
	app/views/admin/admin part/country/country_zone_form.php
	app/views/admin/admin part/country/country_zones.php
	app/views/admin/admin part/country/form.php
	app/views/admin/admin part/country/index.php
	app/views/admin/admin part/coupon/form.php
	app/views/admin/admin part/coupon/index.php
	app/views/admin/admin part/customer/address_form.php
	app/views/admin/admin part/customer/addresses.php
	app/views/admin/admin part/customer/form.php
	app/views/admin/admin part/customer/group_form.php
	app/views/admin/admin part/customer/groups.php
	app/views/admin/admin part/customer/index.php
	app/views/admin/admin part/customer/subscriber_list.php
	app/views/admin/admin part/dashboard/dashboard.php
	app/views/admin/admin part/digital_product/index.php
	app/views/admin/admin part/gift_card/form.php
	app/views/admin/admin part/gift_card/index.php
	app/views/admin/admin part/gift_card/settings.php
	app/views/admin/admin part/order/orders.php
	app/views/admin/admin part/order/xml.php
	app/views/admin/admin part/page/form.php
	app/views/admin/admin part/page/index.php
	app/views/admin/admin part/page/link_form.php
	app/views/admin/admin part/payment/module_settings.php
	app/views/admin/admin part/product/form.php
	app/views/admin/admin part/product/index.php
	app/views/admin/admin part/report/index.php
	app/views/admin/admin part/setting/canned_message_form.php
	app/views/admin/admin part/shipping/module_settings.php
	app/views/admin/admin--/form.php
	app/views/admin/admin--/index.php
	app/views/admin/admin/form.php
	app/views/admin/admin/index.php
	app/views/admin/admin_form.php
	app/views/admin/admins.php
	app/views/admin/banner/form.php
	app/views/admin/banner/index.php
	app/views/admin/banner_form.php
	app/views/admin/banners.php
	app/views/admin/canned_message_form.php
	app/views/admin/categories.php
	app/views/admin/category/category.php
	app/views/admin/category/form.php
	app/views/admin/category/index.php
	app/views/admin/category_form.php
	app/views/admin/countries.php
	app/views/admin/country/country_zone_area_form.php
	app/views/admin/country/country_zone_areas.php
	app/views/admin/country/country_zone_form.php
	app/views/admin/country/country_zones.php
	app/views/admin/country/form.php
	app/views/admin/country/index.php
	app/views/admin/country_form.php
	app/views/admin/country_zone_area_form.php
	app/views/admin/country_zone_areas.php
	app/views/admin/country_zone_form.php
	app/views/admin/country_zones.php
	app/views/admin/coupon/form.php
	app/views/admin/coupon/index.php
	app/views/admin/coupon_form.php
	app/views/admin/coupons.php
	app/views/admin/customer/address_form.php
	app/views/admin/customer/addresses.php
	app/views/admin/customer/form.php
	app/views/admin/customer/group_form.php
	app/views/admin/customer/groups.php
	app/views/admin/customer/index.php
	app/views/admin/customer/subscriber_list.php
	app/views/admin/customer/xml.php
	app/views/admin/customer_address_form.php
	app/views/admin/customer_addresses.php
	app/views/admin/customer_form.php
	app/views/admin/customer_group_form.php
	app/views/admin/customer_groups.php
	app/views/admin/customer_subscriber_list.php
	app/views/admin/customers.php
	app/views/admin/customers_xml.php
	app/views/admin/dashboard.php
	app/views/admin/dashboard/dashboard.php
	app/views/admin/digital_product/index.php
	app/views/admin/digital_products.php
	app/views/admin/gift_card/form.php
	app/views/admin/gift_card/index.php
	app/views/admin/gift_card/settings.php
	app/views/admin/giftcard_form.php
	app/views/admin/giftcards.php
	app/views/admin/giftcards_settings.php
	app/views/admin/header.php
	app/views/admin/link_form.php
	app/views/admin/order/orders.php
	app/views/admin/order/xml.php
	app/views/admin/orders.php
	app/views/admin/orders_xml.php
	app/views/admin/organize_category.php
	app/views/admin/page/form.php
	app/views/admin/page/index.php
	app/views/admin/page/link_form.php
	app/views/admin/page_form.php
	app/views/admin/pages.php
	app/views/admin/payment/module_settings.php
	app/views/admin/payment_module_settings.php
	app/views/admin/product/form.php
	app/views/admin/product/index.php
	app/views/admin/product_form.php
	app/views/admin/products.php
	app/views/admin/report/index.php
	app/views/admin/reports.php
	app/views/admin/setting/canned_message_form.php
	app/views/admin/shipping/module_settings.php
	app/views/admin/shipping_module_settings.php
	modules/banner/views/admin/banner/index.php
	modules/box/views/admin/box/form.php
	modules/category/views/admin/category/form.php
	modules/customer/views/admin/customer/xml.php