clear
base
base
git-error :(
Add calculate Shipping_Cost into CartPage.
1. Russian Post. 1 Class
2. EMS Russian Post

Shipping_Cost save in Order.
Merge branch 'home' into testing

Conflicts:
	.htaccess
	adminka/app/ArticleCategories/add.php
	adminka/app/ArticleCategories/save.php
	adminka/app/ArticleCategories/save_seo_form.php
	adminka/app/ArticleCategories/select_for_combobox.php
	adminka/app/Brands/add.php
	adminka/app/Brands/save.php
	adminka/app/Brands/save_seo_form.php
	adminka/app/Categories/add.php
	adminka/app/Categories/save.php
	adminka/app/Categories/save_seo_form.php
	adminka/app/Orders/add.php
	adminka/app/Orders/data_for_grid.php
	adminka/app/Orders/save.php
	adminka/app/Products/add.php
	adminka/app/Products/save.php
	adminka/app/Products/save_seo_form.php
	adminka/app/Products/select_images.php
	adminka/app/Tree/ajax.php
	adminka/app/_base/ArticleCategory_DALC.php
	adminka/app/_base/Cart_DALC.php
	adminka/app/_base/DALC.php
	adminka/app/_base/Managers_DALC.php
	adminka/app/_base/UI.php
	adminka/app/classes.php
	adminka/article_categories.php
	adminka/article_categories/form.js
	adminka/articles.php
	adminka/brands.php
	adminka/index.php
	adminka/orders.php
	adminka/orders/grid.js
	adminka/product_categories.php
	adminka/products.php
	adminka/resources/css/data-view.css
	adminka/ux/DataView/DragSelector.js
	backup/dumper.cfg.php
	css/kinetic.css
	css/kinetic_product.css
	dumper.php
	includes/_base/Cart_DALC.php
	includes/_base/Category_DALC.php
	includes/_base/Currency_DALC.php
	includes/_base/DALC.php
	includes/_base/Managers_DALC.php
	includes/_base/Order_DALC.php
	includes/_base/Product_DALC.php
	includes/_base/UI.php
	includes/_pages/CartPage/tmp/default.tmp
	includes/_pages/CategoryPage/CategoryPage_UI.php
	includes/_pages/CategoryPage/tmp/default.tmp
	includes/_pages/CreateOrderPage/CreateOrderPage_BLLC.php
	includes/_pages/CreateOrderPage/CreateOrderPage_UI.php
	includes/_pages/HomePage/tmp/default.tmp
	includes/_pages/InfoPage/tmp/default.tmp
	includes/_pages/Page_UI.php
	includes/_pages/ProductPage/ProductPage_BLLC.php
	includes/_pages/ProductPage/tmp/default.tmp
	includes/accessories_side_menu/AccessoriesSideMenu_BLLC.php
	includes/accessories_side_menu/AccessoriesSideMenu_DALC.php
	includes/accessories_side_menu/AccessoriesSideMenu_UI.php
	includes/bestseller_footer_list/BestsellerFooterList_BLLC.php
	includes/bestseller_footer_list/BestsellerFooterList_DALC.php
	includes/bestseller_footer_list/BestsellerFooterList_UI.php
	includes/brand/Brand_BLLC.php
	includes/brand/Brand_UI.php
	includes/brand_footer_viewed/BrandFooterViewed_BLLC.php
	includes/brand_footer_viewed/BrandFooterViewed_DALC.php
	includes/brand_footer_viewed/BrandFooterViewed_UI.php
	includes/brand_side_menu/BrandSideMenu_BLLC.php
	includes/brand_side_menu/BrandSideMenu_DALC.php
	includes/brand_side_menu/BrandSideMenu_UI.php
	includes/breadcrumbs/Breadcrumbs_DALC.php
	includes/category_info/CategoryInfo_BLLC.php
	includes/category_info/CategoryInfo_DALC.php
	includes/category_info/CategoryInfo_UI.php
	includes/category_products/CategoryProducts_BLLC.php
	includes/category_products/CategoryProducts_DALC.php
	includes/classes.php
	includes/column_cart/ColumnCart_BLLC.php
	includes/column_cart/ColumnCart_DALC.php
	includes/column_cart/tmp/default.tmp
	includes/column_cart/tmp/empty.tmp
	includes/column_compare_products/ColumnCompareProducts_BLLC.php
	includes/column_compare_products/ColumnCompareProducts_DALC.php
	includes/column_compare_products/ColumnCompareProducts_UI.php
	includes/content_slider/ContentSlider_BLLC.php
	includes/content_slider/ContentSlider_DALC.php
	includes/content_slider/ContentSlider_UI.php
	includes/create_order/CreateOrder_BLLC.php
	includes/create_order/CreateOrder_UI.php
	includes/create_order/tmp/step1.tmp
	includes/create_order/tmp/step2.tmp
	includes/create_order/tmp/step3.tmp
	includes/dalc/1.php
	includes/dalc/global.php
	includes/featured_products/FeaturedProducts_BLLC.php
	includes/featured_products/FeaturedProducts_DALC.php
	includes/featured_products/FeaturedProducts_UI.php
	includes/footer_menu/FooterMenu_UI.php
	includes/footer_menu/tmp/default.tmp
	includes/footer_viewed/FooterViewed_UI.php
	includes/info_page_content/href_generate.php
	includes/info_page_content/tmp/contact.tmp
	includes/modal_cart/ModalCart_DALC.php
	includes/modal_cart/tmp/modal.tmp
	includes/new_footer_list/NewFooterList_BLLC.php
	includes/new_footer_list/NewFooterList_DALC.php
	includes/new_footer_list/NewFooterList_UI.php
	includes/newsletter/Newsletter_BLLC.php
	includes/newsletter/Newsletter_DALC.php
	includes/newsletter/Newsletter_UI.php
	includes/order/Order_BLLC.php
	includes/popular_footer_list/PopularFooterList_BLLC.php
	includes/popular_footer_list/PopularFooterList_DALC.php
	includes/popular_footer_list/PopularFooterList_UI.php
	includes/product/Product_BLLC.php
	includes/product/Product_UI.php
	includes/product_footer_viewed/ProductFooterViewed_BLLC.php
	includes/product_footer_viewed/ProductFooterViewed_DALC.php
	includes/product_footer_viewed/ProductFooterViewed_UI.php
	includes/product_scroller/ProductScroller_BLLC.php
	includes/product_scroller/ProductScroller_DALC.php
	includes/product_scroller/ProductScroller_UI.php
	includes/search_results/SearchResults_BLLC.php
	includes/search_results/SearchResults_DALC.php
	includes/search_results/SearchResults_UI.php
	includes/shoping_cart/ShopingCart_BLLC.php
	includes/shoping_cart/ShopingCart_UI.php
	includes/shoping_cart/tmp/default.tmp
	includes/side_menu/SideMenu_UI.php
	includes/slider/Slider_BLLC.php
	includes/slider/Slider_DALC.php
	includes/slider/Slider_UI.php
	includes/top_menu/TopMenu_UI.php
	includes/top_menu/tmp/default.tmp
	index.php
	robots.txt
	var.php
Merge branch 'testing' into work

Conflicts:
	.htaccess
	adminka/app.js
	adminka/app/ArticleCategories/add.php
	adminka/app/ArticleCategories/delete.php
	adminka/app/ArticleCategories/form.php
	adminka/app/ArticleCategories/save.php
	adminka/app/ArticleCategories/save_seo_form.php
	adminka/app/ArticleCategories/select_articles.php
	adminka/app/ArticleCategories/select_for_combobox.php
	adminka/app/Articles/add.php
	adminka/app/Articles/delete.php
	adminka/app/Articles/form.php
	adminka/app/Articles/save.php
	adminka/app/Articles/save_seo_form.php
	adminka/app/Brands/add.php
	adminka/app/Brands/add_recomended_products.php
	adminka/app/Brands/data_for_grid.php
	adminka/app/Brands/delete.php
	adminka/app/Brands/form.php
	adminka/app/Brands/remove_recomended_products.php
	adminka/app/Brands/request.php
	adminka/app/Brands/save.php
	adminka/app/Brands/save_seo_form.php
	adminka/app/Brands/select_for_combobox.php
	adminka/app/Brands/select_not_recomended_products.php
	adminka/app/Brands/select_recomended_products.php
	adminka/app/Categories/add.php
	adminka/app/Categories/add_recomended_products.php
	adminka/app/Categories/data_for_grid.php
	adminka/app/Categories/delete.php
	adminka/app/Categories/form.php
	adminka/app/Categories/remove_recomended_products.php
	adminka/app/Categories/request.php
	adminka/app/Categories/save.php
	adminka/app/Categories/save_seo_form.php
	adminka/app/Categories/select_for_combobox.php
	adminka/app/Categories/select_not_recomended_products.php
	adminka/app/Categories/select_recomended_products.php
	adminka/app/Orders/add.php
	adminka/app/Orders/data_for_grid.php
	adminka/app/Orders/delete.php
	adminka/app/Orders/form.php
	adminka/app/Orders/get_order.php
	adminka/app/Orders/request.php
	adminka/app/Orders/save.php
	adminka/app/Orders/select_order_items.php
	adminka/app/Products/add.php
	adminka/app/Products/add_similar_products.php
	adminka/app/Products/data_for_grid.php
	adminka/app/Products/delete.php
	adminka/app/Products/delete_images.php
	adminka/app/Products/form.php
	adminka/app/Products/remove_similar_products.php
	adminka/app/Products/request.php
	adminka/app/Products/save.php
	adminka/app/Products/save_seo_form.php
	adminka/app/Products/select_images.php
	adminka/app/Products/select_not_similar_products.php
	adminka/app/Products/select_similar_products.php
	adminka/app/Products/upload_images.php
	adminka/app/SendMessages/data_for_grid.php
	adminka/app/SendMessages/delete.php
	adminka/app/SendMessages/form.php
	adminka/app/SendMessages/request.php
	adminka/app/Tree/ajax.php
	adminka/app/_base/ArticleCategory_DALC.php
	adminka/app/_base/Article_DALC.php
	adminka/app/_base/Brand_DALC.php
	adminka/app/_base/Cart_DALC.php
	adminka/app/_base/Category_DALC.php
	adminka/app/_base/Currency_DALC.php
	adminka/app/_base/DALC.php
	adminka/app/_base/Managers_DALC.php
	adminka/app/_base/Order_DALC.php
	adminka/app/_base/Product_DALC.php
	adminka/app/_base/SendMessage_DALC.php
	adminka/app/_base/UI.php
	adminka/app/classes.php
	adminka/app/request.php
	adminka/article_categories.php
	adminka/article_categories/form.js
	adminka/article_categories/form_add.js
	adminka/article_categories/form_app.js
	adminka/article_categories/grid.js
	adminka/article_categories/grid_app.js
	adminka/articles.php
	adminka/articles/form.js
	adminka/articles/form_add.js
	adminka/articles/form_app.js
	adminka/articles/grid.js
	adminka/articles/grid_app.js
	adminka/brands.php
	adminka/brands/form.js
	adminka/brands/form_add.js
	adminka/brands/form_app.js
	adminka/brands/grid.js
	adminka/brands/grid_app.js
	adminka/extjs/bootstrap.js
	adminka/extjs/builds/ext-core.js
	adminka/extjs/ext-all-debug.js
	adminka/extjs/ext-all.js
	adminka/extjs/release-notes.html
	adminka/extjs/resources/css/ext-all.css
	adminka/extjs/welcome/css/welcome.css
	adminka/extjs/welcome/css/welcome_ie6.css
	adminka/extjs/welcome/release-notes.css
	adminka/index.php
	adminka/menu_tree.js
	adminka/orders.php
	adminka/orders/form.js
	adminka/orders/form_add.js
	adminka/orders/form_app.js
	adminka/orders/grid.js
	adminka/orders/grid_app.js
	adminka/product_categories.php
	adminka/product_categories/form.js
	adminka/product_categories/form_add.js
	adminka/product_categories/form_app.js
	adminka/product_categories/grid.js
	adminka/product_categories/grid_app.js
	adminka/products.php
	adminka/products/form.js
	adminka/products/form_add.js
	adminka/products/form_app.js
	adminka/products/grid.js
	adminka/products/grid_app.js
	adminka/resources/css/data-view.css
	adminka/resources/css/style.css
	adminka/send_messages.php
	adminka/send_messages/form.js
	adminka/send_messages/form_app.js
	adminka/send_messages/grid.js
	adminka/send_messages/grid_app.js
	adminka/utils.js
	adminka/ux/DataView/DragSelector.js
	backup/dumper.cfg.php
	backup/index.html
	css/joomla.css
	css/kinetic.css
	css/kinetic_product.css
	css/product-view.css
	css/style.css
	css/template.css
	css/typography.css
	dumper.php
	includes/_base/ArticleCategory_DALC.php
	includes/_base/Article_DALC.php
	includes/_base/Brand_DALC.php
	includes/_base/Cart_DALC.php
	includes/_base/Category_DALC.php
	includes/_base/Currency_DALC.php
	includes/_base/DALC.php
	includes/_base/Managers_DALC.php
	includes/_base/Order_DALC.php
	includes/_base/Product_DALC.php
	includes/_base/UI.php
	includes/_base/_temp_DALC.php
	includes/_pages/CartPage/CartPage_BLLC.php
	includes/_pages/CartPage/CartPage_UI.php
	includes/_pages/CartPage/tmp/default.tmp
	includes/_pages/CategoryPage/CategoryPage_UI.php
	includes/_pages/CategoryPage/tmp/default.tmp
	includes/_pages/CreateOrderPage/CreateOrderPage_BLLC.php
	includes/_pages/CreateOrderPage/CreateOrderPage_UI.php
	includes/_pages/CreateOrderPage/tmp/default.tmp
	includes/_pages/HomePage/HomePage_UI.php
	includes/_pages/HomePage/tmp/default.tmp
	includes/_pages/InfoPage/InfoPage_UI.php
	includes/_pages/InfoPage/tmp/default.tmp
	includes/_pages/Page_UI.php
	includes/_pages/ProductPage/ProductPage_BLLC.php
	includes/_pages/ProductPage/ProductPage_UI.php
	includes/_pages/ProductPage/tmp/default.tmp
	includes/_pages/SearchPage/SearchPage_UI.php
	includes/_pages/SearchPage/tmp/default.tmp
	includes/accessories_side_menu/AccessoriesSideMenu_BLLC.php
	includes/accessories_side_menu/AccessoriesSideMenu_DALC.php
	includes/accessories_side_menu/AccessoriesSideMenu_UI.php
	includes/accessories_side_menu/tmp/default.tmp
	includes/article/Article_BLLC.php
	includes/article/Article_UI.php
	includes/article/tmp/default.tmp
	includes/article_category/ArticleCategory_BLLC.php
	includes/article_category/ArticleCategory_UI.php
	includes/article_category/tmp/default.tmp
	includes/bestseller_footer_list/BestsellerFooterList_BLLC.php
	includes/bestseller_footer_list/BestsellerFooterList_DALC.php
	includes/bestseller_footer_list/BestsellerFooterList_UI.php
	includes/bestseller_footer_list/tmp/default.tmp
	includes/brand/Brand_BLLC.php
	includes/brand/Brand_UI.php
	includes/brand/tmp/default.tmp
	includes/brand_footer_viewed/BrandFooterViewed_BLLC.php
	includes/brand_footer_viewed/BrandFooterViewed_DALC.php
	includes/brand_footer_viewed/BrandFooterViewed_UI.php
	includes/brand_footer_viewed/tmp/default.tmp
	includes/brand_side_menu/BrandSideMenu_BLLC.php
	includes/brand_side_menu/BrandSideMenu_DALC.php
	includes/brand_side_menu/BrandSideMenu_UI.php
	includes/brand_side_menu/tmp/default.tmp
	includes/breadcrumbs/Breadcrumbs_BLLC.php
	includes/breadcrumbs/Breadcrumbs_DALC.php
	includes/breadcrumbs/Breadcrumbs_UI.php
	includes/breadcrumbs/tmp/article.tmp
	includes/breadcrumbs/tmp/article_category.tmp
	includes/breadcrumbs/tmp/category.tmp
	includes/breadcrumbs/tmp/product.tmp
	includes/category_info/CategoryInfo_BLLC.php
	includes/category_info/CategoryInfo_DALC.php
	includes/category_info/CategoryInfo_UI.php
	includes/category_info/tmp/default.tmp
	includes/category_products/CategoryProducts_BLLC.php
	includes/category_products/CategoryProducts_DALC.php
	includes/category_products/CategoryProducts_UI.php
	includes/category_products/tmp/default.tmp
	includes/classes.php
	includes/column_cart/ColumnCart_BLLC.php
	includes/column_cart/ColumnCart_DALC.php
	includes/column_cart/ColumnCart_UI.php
	includes/column_cart/tmp/default.tmp
	includes/column_cart/tmp/empty.tmp
	includes/column_compare_products/ColumnCompareProducts_BLLC.php
	includes/column_compare_products/ColumnCompareProducts_DALC.php
	includes/column_compare_products/ColumnCompareProducts_UI.php
	includes/column_compare_products/tmp/default.tmp
	includes/content_slider/ContentSlider_BLLC.php
	includes/content_slider/ContentSlider_DALC.php
	includes/content_slider/ContentSlider_UI.php
	includes/content_slider/tmp/default.tmp
	includes/create_order/CreateOrder_BLLC.php
	includes/create_order/CreateOrder_UI.php
	includes/create_order/tmp/step1.tmp
	includes/create_order/tmp/step2.tmp
	includes/create_order/tmp/step3.tmp
	includes/dalc/1.php
	includes/dalc/global.php
	includes/featured_products/FeaturedProducts_BLLC.php
	includes/featured_products/FeaturedProducts_DALC.php
	includes/featured_products/FeaturedProducts_UI.php
	includes/featured_products/tmp/default.tmp
	includes/footer_menu/FooterMenu_UI.php
	includes/footer_menu/tmp/default.tmp
	includes/footer_viewed/FooterViewed_UI.php
	includes/footer_viewed/tmp/default.tmp
	includes/info_page_content/InfoPageContent_UI.php
	includes/info_page_content/href_generate.php
	includes/info_page_content/tmp/contact.tmp
	includes/modal_cart/ModalCart_BLLC.php
	includes/modal_cart/ModalCart_DALC.php
	includes/modal_cart/ModalCart_UI.php
	includes/modal_cart/tmp/default.tmp
	includes/modal_cart/tmp/modal.tmp
	includes/new_footer_list/NewFooterList_BLLC.php
	includes/new_footer_list/NewFooterList_DALC.php
	includes/new_footer_list/NewFooterList_UI.php
	includes/new_footer_list/tmp/default.tmp
	includes/newsletter/Newsletter_BLLC.php
	includes/newsletter/Newsletter_DALC.php
	includes/newsletter/Newsletter_UI.php
	includes/newsletter/tmp/default.tmp
	includes/order/Order_BLLC.php
	includes/popular_footer_list/PopularFooterList_BLLC.php
	includes/popular_footer_list/PopularFooterList_DALC.php
	includes/popular_footer_list/PopularFooterList_UI.php
	includes/popular_footer_list/tmp/default.tmp
	includes/product/Product_BLLC.php
	includes/product/Product_UI.php
	includes/product/tmp/default.tmp
	includes/product_footer_viewed/ProductFooterViewed_BLLC.php
	includes/product_footer_viewed/ProductFooterViewed_DALC.php
	includes/product_footer_viewed/ProductFooterViewed_UI.php
	includes/product_footer_viewed/tmp/default.tmp
	includes/product_scroller/ProductScroller_BLLC.php
	includes/product_scroller/ProductScroller_DALC.php
	includes/product_scroller/ProductScroller_UI.php
	includes/product_scroller/tmp/default.tmp
	includes/search_results/SearchResults_BLLC.php
	includes/search_results/SearchResults_DALC.php
	includes/search_results/SearchResults_UI.php
	includes/search_results/tmp/default.tmp
	includes/shoping_cart/ShopingCart_BLLC.php
	includes/shoping_cart/ShopingCart_DALC.php
	includes/shoping_cart/ShopingCart_UI.php
	includes/shoping_cart/tmp/default.tmp
	includes/shoping_cart/tmp/empty.tmp
	includes/side_menu/SideMenu_UI.php
	includes/side_menu/tmp/default.tmp
	includes/slider/Slider_BLLC.php
	includes/slider/Slider_DALC.php
	includes/slider/Slider_UI.php
	includes/slider/tmp/default.tmp
	includes/top_menu/TopMenu_UI.php
	includes/top_menu/tmp/default.tmp
	index-no.html
	index.php
	js/prototype.js
	js/rokmage-main-js/jquery.easing.1.3.js
	js/rokmage-main-js/truncate.js
	js/rokmage-productview.js
	robots.txt
	upload/flash/images.xml
	var.php
	work-delay/index.html
Deleted unnecessary files "request.php"
also
also