diff --git a/.htaccess b/.htaccess
old mode 100755
new mode 100644
index dadffa268d..9acb08b3f9
--- a/.htaccess
+++ b/.htaccess
@@ -171,6 +171,14 @@
     Order allow,deny
     Allow from all
 
+###########################################
+## Deny access to release notes to prevent disclosure of the installed Magento version
+
+    <Files RELEASE_NOTES.txt>
+        order allow,deny
+        deny from all
+    </Files>
+
 ############################################
 ## If running in cluster environment, uncomment this
 ## http://developer.yahoo.com/performance/rules.html#etags
diff --git a/.htaccess.sample b/.htaccess.sample
old mode 100755
new mode 100644
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 57657e4fb1..cb329b6658 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,3 +1,713 @@
+==== 1.5.1.0 ====                                                                     
+                                             
+=== Improvements ===
+Alternative image storage feature enabled with fixed get.php file.
+Magento Mobile updated to release v20
+Implemented SOAP Faults for GiftMessage API
+- added faults in functions
+- added description in api.xml
+Implemented The names of WPPHS depend on a merchant`s country in the backend. Create a functionality for dynamic changing.
+- Added functionality for dynamic changing the names of WPPHS
+- Added backend config into system.xml
+Implemented WS-I for API
+- added wsi.xml for all WebAPI modules
+- added new wsi-soap handler
+- added new wsi-soap adapter
+- changed admin configuration, added parameter into "Magento Core API"->WSI Compliance
+- changed api.xml
+Implemented GiftMessage for Cart
+
+=== Changes ===
+Replaced usage of Varien_File_Uploader with Mage_Core_Model_File_Uploader
+
+=== Fixes ===
+Fixed PayPal Standard: order has two invoice and two refund
+Fixed Adjustment Fee, Adjustment Refund and Refund Shipping fields must be disabled on credit memo for Payflow Pro and PayFlowLink payment methods
+- Actualized API params mapping 
+- Added parameter Amount into refund request
+Fixed Broken mysql4-data-upgrade-1.4.0.0.13-1.4.0.0.14.php file
+Fixed XMLConnect - edited parameter cannot be saved
+Fixed Media storage - problem with image in the CMS pages
+- Added functional to get files with disabled db media storage feature through the get.php script
+Fixed Unable to place order using PayPal Billing agreement through Checkout with multiple addresses
+- Added additional multi shipping checkout exceptions logging.
+Fixed No AmericanExpress support in Website Payments Pro Payflow Edition
+- Added to Direct payment 
+Fixed Incorrect Subtotal(Incl. Tax) in Shopping Cart, when catalog prices entered by admin include tax
+Fixed Function "Apply Tax On - Original price only" does not correct calculate product tax
+Fixed No ability to save Product Attribute with type Media Image
+Fixed Mage_CatalogSearch_Model_Query::getMaxQueryLenght() is not properly deprecated.
+Fixed Two links in forgotpassword.phtml template lead to not existent files
+Fixed Added compiled js and css to whitelist. Added removing of relative URL parts to get.php.
+Fixed several probable vulnerabilities on front and backend
+Fixed Incorrect error message when extension state is lower than preferred state
+Fixed No rule applied when coupon code is no longer valid
+- verify if rule uses coupon at all before coupon check
+Fixed Argument passed to Mage_Catalog_Helper_Image::init() must be an instance of Mage_Catalog_Model_Product, instance of Mage_Wishlist_Model_Item given
+Fixed Varien_Db_Adapter_Mysqli::raw_query() should throw an Exception after 10 tries
+Fixed Import file downloaded from FTP in BINARY mode
+- added option(ASCII || BINARY) for mode of file transferring;
+- default mode of file transferring is BINARY;
+- was changed property "type" of input field for password.
+Fixed User interface: real mistake in the label name, Api instead API
+Fixed issue with URL Rewrite Rule for new products with no category information
+Fixed Invoice do not created when using "Automatically Invoice All Items" option of Zero Subtotal Checkout
+Fixed Additional dot when checking out as Guest
+Fixed Prefix and suffix aren't visible in Add New Address Form
+Fixed Calculation order for Catalog Price Rule and Configurable Product option price
+Fixed When put values in Customer Name and Address Options they do not reflect on the backend customer and customer address forms
+Fixed Custom URL Rewrite creation broken
+- skip filtering for store select if no product or category specified in case of custom rewrite
+Fixed Shopping Cart Price Rule->Conditions->Shipping Country is not correctly controlled on multiple checkout.
+- Added checking: if address object is a new object rules validation cache will not working because we can not save validation results for address without id
+Fixed Resources names are not translated on Role Resources page at backend 
+Fixed Multiselect and Dropdown Attribute values set to "0" are not exported correctly
+Fixed WYSIWYG Editor - Unable to Create a Folder when Inserting a File
+Fixed Wrong cache key for websites
+- {{base_url}} not replaced with url on the saving in the cache. {{base_url}} replaced with  base url on the getting.
+Fixed After second refund made from paypal user get wrong refund amounts
+Fixed Multiselect and Dropdown Attribute values set to "0" are not exported correctly
+- modified condition for option emptiness check to pass string and int zero values
+Fixed Infinite loop is started, when backend user selects non-existing time period for a chart on Dashboard
+Fixed Missing isset() in Mage_Sales_Model_Recurring_Profile::createOrder()
+- Added the filtering "value" key on the setting in the conditions: Order Number, Purchased Quantity, Sales Amount
+Fixed Discount is not applied to product in case when in conditions of Catalog Price Rule "contains" is chosen
+Fixed Unable to open "View all wishlist items" link from email
+Fixed Specifying incorrect timezone in configuration causes halt of backend work flow and inability to add products to a Cart on frontend
+- Added timezone validation
+Fixed Checkout with Configurable Product includes disabled simple
+- removing parent from shopping cart if child becomes disabled or out of stock
+Fixed Validate Each Address Separately in Multi-address Checkout do not working
+Fixed Google Checkout - catalog price discount for Configurable product is calculated incorrectly
+Fixed FPT with prices included tax problem
+Fixed Incorrect Excl. Tax in product page, when catalog prices entered by admin include tax
+- Fixed JS excluding tax price recalculation
+Fixed Unable to configure Grouped product from the backend
+Fixed Order, that related with Recurring Profile does not displayed
+Fixed Discount is not applied to product in case when in conditions of Catalog Price Rule "contains" is chosen
+Fixed After second refund made from paypal user get wrong refund amounts
+Fixed WPPHS payment method has tags in the name
+Fixed Symlinks do not work for back-end blocks
+Fixed The names of WPPHS depend on a merchant`s country in the backend. Create a functionality for dynamic changing.
+Fixed Disabled success redirect functionality in paypal express checkout
+Fixed Added whitelist support to get.php script
+Fixed Mage_Customer_Model_Address class name is hardcoded in certain models
+Fixed Typo in Mage_ImportExport_Model_Import_Adapter_Abstract::_construct()
+Fixed 'FOUND' and 'NOT FOUND' labels are not translated in Mage_SalesRule_Model_Rule_Condition_Product_Found::loadValueOptions()
+Fixed 'Select' label is not translated in Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid::_prepareColumns()
+Fixed Invalid HTML from form multiline element renderer
+Fixed Collection calling private _setOrder() method in CatalogEvent module
+Fixed Tags on search results for Global Record Search (Adminhtml) are not translatable
+Fixed JavaScript bug in IE8 with date advice set during js validation.
+Fixed Missing translation for ZF error messages
+- provided translation of ZF native validation error messages
+Fixed Shopping Cart Price Rule->Conditions->Shipping Country is not correctly controlled on multiple checkout.
+Fixed Moneybookers Multistore System Configuration
+Fixed Moneybookers OBT Defaults
+Fixed Product info API request
+- a behavior of the function, was optimized;
+- refactoring classes with calling function from helper without changing the inside logic;
+- duplicated code were moved to catalog/product helper with creating the new one function for that.
+Fixed typos in adminhtml widget form block
+- Changed reserved word 'const' to lower case in tax config model
+Fixed Google Base Synchronize
+- Fixed fatal error on very first Publish and then Synchronizing if in GB products already were
+- Fixed potential fatal when on mass Publish action we will not retrieve any item id: expected array, but null or empty string given
+Fixed Rounding issues in shipping methods and in sales payment
+Fixed Usage of non-mb-supported strlen() in custom option validation
+- fixed length calculation routine to work with multi-byte characters
+- changed order of evaluation, so that length is calculated only if length constraint is set for custom option
+Fixed Unused class Mage_Reports_Model_Mysql4_Shopcart_Product_Collection did not marked like deprecated
+- mark class as deprecated after 1.5.0.1
+Fixed Products prepare function
+- Change prepare products function
+- Update resource with phpDoc
+- Update wsdl
+Improved SOAP Faults in Shopping Cart
+- all faults for ShoppingCart are unique for each issue and have wide description
+Fixed Shopping Cart create order should return order increment id
+- updated wsdl, wsi
+- changed return type for Mage_Checkout_Model_Cart_Api::createOrder
+Fixed Grouped product has no configured price in Wishlist
+Fixed Unable to continue checkout when "Street Address" use non english characters
+Fixed Misprint in comment in Mage_Checkout_Model_Cart::init()
+Fixed Controllers used protected properties
+- removed protected property _hasDataChanges equals true in controllers
+- added property _hasDataChanges equals true in method "addComment" for all objects
+Fixed Page "404 Not Found" is showed by clicked Edit link in the Invoice page of placed order
+Fixed Google Base Synchronize
+Fixed Error on Authorize.net Direct Post payment method in Backend
+Fixed API default/SOAP functionality switched
+- removed unused variable loading
+- changed loading default api handler in IndexController
+- added loading default "soap" api handler in SoapController
+Fixed Missed unique index on eav table
+Fixed Order status visible_on_front flag in configuration file can't be overridden
+Fixed Unexpected error message appears when quantity to refund more than quantity invoiced
+Fixed PayPal payment methods are not shown on the checkout Payment Information step if Brazilian Real is set as base currency
+- Added new supported currency codes into config
+Fixed Trim value after explode
+Fixed Unable to save customer date attribute with date more then 2010
+Fixed No customer's information
+Fixed PayPal Business Email address update
+Fixed Hovering mouse cursor on "Configure" button for a composite product shows incorrect hint
+Fixed Error in fulltext search indexation for values that contain 'à' character
+- modified regular expression to correct process of unicode characters
+Fixed Zooming don't work for an image larger or taller than the container
+Fixed Variable  is used before its definition in Mage_CatalogRule_Helper_Data::calcPriceRule()
+Fixed Typo in app\design\frontend\base\default\template\checkout\success.phtml
+Fixed Fatal error during newsletters sending via cron
+- Also added missed PHP-docs to Mage_Newsletter_Model_Problem class.
+Fixed Quantity of bundle item is not stored correctly, in case when it is decimal
+Fixed Unable to change configurable product name for store view
+- the bug was in two HTML input tags with same names located on "General" and "Associated Products" tabs. One of them was been renamed to solve the problem.
+Fixed Microsoft Excel 2007 fails to open Magento generated XML file
+Fixed Admin page - incorrect displaying of pop-up message for gift options in Items Ordered block
+Fixed One extra unnecessary product appears in Items Ordered list of placed Order, when payment is provided using Authorize.net Direct Post
+Fixed If 3D Secure Card Validation is enabled then Gift Options section has wrong position during backend order creation
+Fixed Reindex of Category Products for large catalogs is extremely slow
+Fixed Product minimum quantity, add to cart
+Fixed Created in Backend customer doubled after creation order for him and not save any addres information
+Fixed Changes to helper text for the images for the application submission page
+Fixed Redirect patch
+Fixed product list images for iPad device to use base image
+Fixed Sending invoice email don`t change the status
+Fixed remove paypal country id hard coded
+Fixed Mobile Controller issue
+Fixed App locations (countries) do not match iTunes App Stores countries available
+Fixed Disabled cookie message issue
+Fixed Information about Gift Options is not stored, when admin user performs Edit Order action in backend
+Fixed Web form with empty fields can be saved - also is_object() calls are replaced with instanceof checking inside of Adminhtml/MobileController
+Fixed Bundle product with required option must have "Configure" button inactive if one of the option is out of stock.
+Fixed Unable to retrieve product attributes, "Unsupported operand types"
+Fixed Add to Wishlist is not work
+Fixed A bug inside catalog/model/product/Api.php::create prevents this function from working
+- Added $store parameter.
+Fixed CSS Merger Cache Ignores Hostname and HTTPS
+- on frontend when "Use Secure URLs in Frontend" is set to "yes", https is used only for some selected pages. This fix takes into account what's the protocol in use
+Fixed Improvement to block caching
+Fixed Typo in Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::savePrices()
+Fixed Shipping creation for bundle product shows wrong q-ty
+Fixed Check for controller instance in rating option resource model
+Fixed Export Filters are not working correctly during export of customers
+Fixed Function "Apply Tax On - Original price only" does not correct calculate product tax
+Fixed Mage_Index.csv is not used at all
+Fixed Incorrect tax count, when making new order through back-end and using discount coupon (price cart rule)
+Fixed Error "Source file moving failed" on Import process, when PHP version is 5.2
+Fixed "Store credit amount can not exceed order amount" error in Credit Memo applying to Store Credit for decimal quantities and decimal subtotals
+Fixed Disabled cookie message issue
+Fixed Edit Order without creating new one functionality doesn't save changes in non-default customer address attributes
+Fixed Unable to buy Downloadable product with specified option "Links can be purchased separately" set to "No"
+Fixed Incorrect message of soap fault
+Fixed Information about Gift Options is not stored, when admin user performs Edit Order action in backend
+Fixed Unable to open "View all wishlist items" link from email
+- Added action to add shared wishlist item to shopping cart
+Fixed iFrame must be centered for Website Payments Pro Hosted Solution payment method.
+Fixed Free shipping does not transfer to Google Checkout when it is enabled in a shipping method
+- Added support of UPS carrier methods with UPS XML type of rates calculation
+Fixed Incorrect tax summary for partial credit memos/invoices
+Fixed PayPal Standart: order has two invoice and two refund
+Fixed A product hasn't been added to whishlist from category with closed, upcoming events
+Fixed Customer password is not imported from CSV file
+Fixed CDN - necessary to replace information message
+Fixed When put values in Customer Name and Address Options they do not reflect on the backend customer and customer address forms
+Fixed Reports-> Products-> Products ordered - Trace appeared
+Fixed Mage_Core_Helper_Url::getCurrentUrl() method ignores server PORT
+Fixed No ability to change payment from Store Credits, when customer backs to a Cart from Order Review step, and then goes to checkout again (OnePageCheckout)
+Fixed Customer attribute labels not translated in validation error messages
+- added translation for attribute labels at classes Mage_Customer_Model_Attribute_Data_*
+Fixed Typos in: Varien_Db_Adapter_Pdo_Mysql, Varien_File_Uploader
+Fixed Mage_Core_Model_Design_Package::_prepareUrl() uses incorrect regular expression to check whether the url is relative
+- modified preg_match for detecting absolute urls
+Fixed Mage_Catalog_Block_Product_Gallery::getImageWidth() returns false for images with width smaller than 600px
+- modified method Mage_Catalog_Block_Product_Gallery::getImageWidth(), if width <= 600 return width value, not false
+Fixed Incorrect view of the shipping tax at the back end, unnecessary $0.01
+Fixed Wrong visualisation of "Original Price" in placed order
+- collecting totals for quote at multishipping checkout
+Fixed Incorrect view of popup windows for composite product on backend (only IE)
+Added Adding Composite Products in Admin Order Creation
+- Fixed styles in ie7
+Fixed "Items Ordered" tab is not refreshing while Admin order creation
+Fixed Free shipping does not transfer to Google Checkout when it is enabled in a shipping method
+- Re factored and optimized code
+- Improved performance
+- Added dependency for GoogleCheckout module from Usa module
+- Added fedex and usps free methods supporting
+
+
+
+==== 1.5.x-devel-104676 ====
+
+=== Improvements ===
+Magento Mobile updated to release v20
+
+=== Fixes ===
+Fixed PayPal Standard: order has two invoice and two refund
+Fixed Adjustmen Fee, Adjustment Refund and Refund Shipping fields must be disabled on credit memo for Payflow Pro and PayFlowLink payment methods
+- Actualized API params mapping 
+- Added parameter Amount into refund request
+Fixed Broken mysql4-data-upgrade-1.4.0.0.13-1.4.0.0.14.php file
+Fixed XMLConnect - edited parameter cannot be saved
+Fixed Media storage - problem with image in the CMS pages
+- Added functional to get files with disabled db media storage feature through the get.php script
+Fixed Unable to place order using PayPal Billing agreement through Checkout with multiple addresses
+- Added additional multi shipping checkout exceptions logging.
+Fixed No AmericanExpress support in Website Payments Pro Payflow Edition
+- Added to Direct payment 
+Fixed Incorrect Subtotal(Incl. Tax) in Shopping Cart, when catalog prices entered by admin include tax
+Fixed Function "Apply Tax On - Original price only" does not correct calculate product tax
+Fixed No ability to save Product Attribute with type Media Image
+
+
+==== 1.5.1.0-rc1 ====
+
+=== Improvements ===
+Magento Mobile updated to release v19
+
+=== Changes ===
+Replaced usage of Varien_File_Uploader with Mage_Core_Model_File_Uploader
+
+=== Fixes ===
+Fixed Mage_CatalogSearch_Model_Query::getMaxQueryLenght() is not properly deprecated.
+Fixed Two links in forgotpassword.phtml template lead to not existent files
+Fixed Added compiled js and css to whitelist. Added removing of relative URL parts to get.php.
+Fixed several probable vulnerabilities on front and backend
+Fixed Incorrect error message when extension state is lower than preferred state
+Fixed No rule applied when coupon code is no longer valid
+- verify if rule uses coupon at all before coupon check
+Fixed Argument passed to Mage_Catalog_Helper_Image::init() must be an instance of Mage_Catalog_Model_Product, instance of Mage_Wishlist_Model_Item given
+Fixed Varien_Db_Adapter_Mysqli::raw_query() should throw an Exception after 10 tries
+Fixed Import file downloaded from FTP in BINARY mode
+- added option(ASCII || BINARY) for mode of file transferring;
+- default mode of file transferring is BINARY;
+- was changed property "type" of input field for password.
+Fixed User interface: real mistake in the label name, Api instead API
+Fixed issue with URL Rewrite Rule for new products with no category information
+Fixed Invoice do not created when using "Automatically Invoice All Items" option of Zero Subtotal Checkout
+Fixed Additional dot when checking out as Guest
+Fixed Prefix and suffix aren't visible in Add New Address Form
+Fixed Calculation order for Catalog Price Rule and Configurable Product option price
+Fixed When put values in Customer Name and Address Options they do not reflect on the backend customer and customer address forms
+Fixed Custom URL Rewrite creation broken
+- skip filtering for store select if no product or category specified in case of custom rewrite
+Fixed Shopping Cart Price Rule->Conditions->Shipping Country is not correctly controlled on multiple checkout.
+- Added checking: if address object is a new object rules validation cache will not working because we can not save validation results for address without id
+Fixed Resources names are not translated on Role Resources page at backend 
+Fixed Multiselect and Dropdown Attribute values set to "0" are not exported correctly
+Fixed WYSIWYG Editor - Unable to Create a Folder when Inserting a File
+Fixed Wrong cache key for websites
+- {{base_url}} not replaced with url on the saving in the cache. {{base_url}} replaced with  base url on the getting.
+Fixed After second refund made from paypal user get wrong refund amounts
+Fixed Multiselect and Dropdown Attribute values set to "0" are not exported correctly
+- modified condition for option emptiness check to pass string and int zero values
+Fixed Infinite loop is started, when backend user selects non-existing time period for a chart on Dashboard
+Fixed Missing isset() in Mage_Sales_Model_Recurring_Profile::createOrder()
+- Added the filtering "value" key on the setting in the conditions: Order Number, Purchased Quantity, Sales Amount
+Fixed Discount is not applied to product in case when in conditions of Catalog Price Rule "contains" is chosen
+Fixed Unable to open "View all wishlist items" link from email
+Fixed Specifying incorrect timezone in configuration causes halt of backend work flow and inability to add products to a Cart on frontend
+- Added timezone validation
+Fixed Checkout with Configurable Product includes disabled simple
+- removing parent from shopping cart if child becomes disabled or out of stock
+Fixed Validate Each Address Separately in Multi-address Checkout do not working
+Fixed Google Checkout - catalog price discount for Configurable product is calculated incorrectly
+Fixed FPT with prices included tax problem
+Fixed Incorrect Excl. Tax in product page, when catalog prices entered by admin include tax
+- Fixed JS excluding tax price recalculation
+Fixed Unable to configure Grouped product from the backend
+Fixed Order, that related with Recurring Profile does not displayed
+Fixed Discount is not applied to product in case when in conditions of Catalog Price Rule "contains" is chosen
+Fixed After second refund made from paypal user get wrong refund amounts
+Fixed WPPHS payment method has tags in the name
+
+==== 1.5.x-devel-102426 ====
+
+=== Improvements ===
+Magento Mobile updated to release v19
+
+=== Changes ===
+Replaced usage of Varien_File_Uploader with Mage_Core_Model_File_Uploader
+
+=== Fixes ===
+Fixed Mage_CatalogSearch_Model_Query::getMaxQueryLenght() is not properly deprecated.
+Fixed Two links in forgotpassword.phtml template lead to not existent files
+Fixed Added compiled js and css to whitelist. Added removing of relative URL parts to get.php.
+Fixed several probable vulnerabilities on front and backend
+Fixed Incorrect error message when extension state is lower than preferred state
+Fixed No rule applied when coupon code is no longer valid
+- verify if rule uses coupon at all before coupon check
+Fixed Argument passed to Mage_Catalog_Helper_Image::init() must be an instance of Mage_Catalog_Model_Product, instance of Mage_Wishlist_Model_Item given
+Fixed Varien_Db_Adapter_Mysqli::raw_query() should throw an Exception after 10 tries
+Fixed Import file downloaded from FTP in BINARY mode
+- added option(ASCII || BINARY) for mode of file transferring;
+- default mode of file transferring is BINARY;
+- was changed property "type" of input field for password.
+Fixed User interface: real mistake in the label name, Api instead API
+Fixed issue with URL Rewrite Rule for new products with no category information
+Fixed Invoice do not created when using "Automatically Invoice All Items" option of Zero Subtotal Checkout
+Fixed Additional dot when checking out as Guest
+Fixed Prefix and suffix aren't visible in Add New Address Form
+
+
+
+==== 1.5.1.0-beta1 ====
+
+=== Improvements ===
+Implemented SOAP Faults for GiftMessage API
+- added faults in functions
+- added description in api.xml
+Implemented The names of WPPHS depend on a merchant`s country in the backend. Create a functionality for dynamic changing.
+- Added functionality for dynamic changing the names of WPPHS
+- Added backend config into system.xml
+Implemented WS-I for API
+- added wsi.xml for all WebAPI modules
+- added new wsi-soap handler
+- added new wsi-soap adapter
+- changed admin configuration, added parameter into "Magento Core API"->WSI Compliance
+- changed api.xml
+Implemented GiftMessage for Cart
+
+=== Changes ===
+Updated Magento Mobile package to ver. 18
+
+=== Fixes ===
+Fixed Symlinks do not work for back-end blocks
+Fixed The names of WPPHS depend on a merchant`s country in the backend. Create a functionality for dynamic changing.
+Fixed Disabled success redirect functionality in paypal express checkout
+Fixed Added whitelist support to get.php script
+Fixed Mage_Customer_Model_Address class name is hardcoded in certain models
+Fixed Typo in Mage_ImportExport_Model_Import_Adapter_Abstract::_construct()
+Fixed 'FOUND' and 'NOT FOUND' labels are not translated in Mage_SalesRule_Model_Rule_Condition_Product_Found::loadValueOptions()
+Fixed 'Select' label is not translated in Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid::_prepareColumns()
+Fixed Invalid HTML from form multiline element renderer
+Fixed Collection calling private _setOrder() method in CatalogEvent module
+Fixed Tags on search results for Global Record Search (Adminhtml) are not translatable
+Fixed JavaScript bug in IE8 with date advice set during js validation.
+Fixed Missing translation for ZF error messages
+- provided translation of ZF native validation error messages
+Fixed Shopping Cart Price Rule->Conditions->Shipping Country is not correctly controlled on multiple checkout.
+Fixed Moneybookers Multistore System Configuration
+Fixed Moneybookers OBT Defaults
+Fixed Product info API request
+- a behavior of the function, was optimized;
+- refactoring classes with calling function from helper without changing the inside logic;
+- duplicated code were moved to catalog/product helper with creating the new one function for that.
+Fixed Poor randomness of auto-generated passwords in Customer Model
+- was used function from core helper;
+- code style has been formatted.
+Fixed several probable vulnerabilities on front and backend
+Fixed typos in adminhtml widget form block
+- Changed reserved word 'const' to lower case in tax config model
+Fixed Google Base Synchronize
+- Fixed fatal error on very first Publish and then Synchronizing if in GB products already were
+- Fixed potential fatal when on mass Publish action we will not retrieve any item id: expected array, but null or empty string given
+Fixed Rounding issues in shipping methods and in sales payment
+Fixed Usage of non-mb-supported strlen() in custom option validation
+- fixed length calculation routine to work with multi-byte characters
+- changed order of evaluation, so that length is calculated only if length constraint is set for custom option
+Fixed Unused class Mage_Reports_Model_Mysql4_Shopcart_Product_Collection did not marked like deprecated
+- mark class as deprecated after 1.5.0.1
+Fixed Products prepare function
+- Change prepare products function
+- Update resource with phpDoc
+- Update wsdl
+Improved SOAP Faults in Shopping Cart
+- all faults for ShoppingCart are unique for each issue and have wide description
+Fixed Shopping Cart create order should return order increment id
+- updated wsdl, wsi
+- changed return type for Mage_Checkout_Model_Cart_Api::createOrder
+Fixed Grouped product has no configured price in Wishlist
+Fixed Unable to continue checkout when "Street Address" use non english characters
+Fixed Misprint in comment in Mage_Checkout_Model_Cart::init()
+Fixed Controllers used protected properties
+- removed protected property _hasDataChanges equals true in controllers
+- added property _hasDataChanges equals true in method "addComment" for all objects
+Fixed Page "404 Not Found" is showed by clicked Edit link in the Invoice page of placed order
+Fixed Google Base Synchronize
+Fixed probably SQL-injection in backend
+Fixed Error on Authorize.net Direct Post payment method in Backend
+Fixed API default/SOAP functionality switched
+- removed unused variable loading
+- changed loading default api handler in IndexController
+- added loading default "soap" api handler in SoapController
+Fixed Missed unique index on eav table
+Fixed Its possible to add&proceed to checkout with any product from the catalog no matter website its assign to.
+Fixed Order status visible_on_front flag in configuration file can't be overridden
+Fixed Unexpected error message appears when quantity to refund more than quantity invoiced
+Fixed PayPal payment methods are not shown on the checkout Payment Information step if Brazilian Real is set as base currency
+- Added new supported currency codes into config
+Fixed Trim value after explode
+Fixed Unable to save customer date attribute with date more then 2010
+Fixed No customer's information
+Fixed PayPal Business Email address update
+Fixed probable abuse with image re-size functionality on frontend
+Fixed Hovering mouse cursor on "Configure" button for a composite product shows incorrect hint
+Fixed Error in fulltext search indexation for values that contain 'à' character
+- modified regular expression to correct process of unicode characters
+Fixed Zooming don't work for an image larger or taller than the container
+Fixed Variable  is used before its definition in Mage_CatalogRule_Helper_Data::calcPriceRule()
+Fixed Typo in app\design\frontend\base\default\template\checkout\success.phtml
+Fixed Fatal error during newsletters sending via cron
+- Also added missed PHP-docs to Mage_Newsletter_Model_Problem class.
+Fixed Quantity of bundle item is not stored correctly, in case when it is decimal
+Fixed Unable to change configurable product name for store view
+- the bug was in two HTML input tags with same names located on "General" and "Associated Products" tabs. One of them was been renamed to solve the problem.
+Fixed Microsoft Excel 2007 fails to open Magento generated XML file
+Fixed several probable XSS issues on front end and backend
+Fixed Admin page - incorrect displaying of pop-up message for gift options in Items Ordered block
+Fixed One extra unnecessary product appears in Items Ordered list of placed Order, when payment is provided using Authorize.net Direct Post
+Fixed If 3D Secure Card Validation is enabled then Gift Options section has wrong position during backend order creation
+Fixed Reindex of Category Products for large catalogs is extremely slow
+Fixed Product minimum quantity, add to cart
+Fixed Created in Backend customer doubled after creation order for him and not save any addres information
+Fixed Changes to helper text for the images for the application submission page
+Fixed Redirect patch
+Fixed product list images for iPad device to use base image
+Fixed Sending invoice email don`t change the status
+Fixed remove paypal country id hard coded
+Fixed Mobile Controller issue
+Fixed App locations (countries) do not match iTunes App Stores countries available
+Fixed Disabled cookie message issue
+Fixed Information about Gift Options is not stored, when admin user performs Edit Order action in backend
+Fixed Web form with empty fields can be saved - also is_object() calls are replaced with instanceof checking inside of Adminhtml/MobileController
+Fixed Bundle product with required option must have "Configure" button inactive if one of the option is out of stock.
+Fixed Unable to retrieve product attributes, "Unsupported operand types"
+Fixed Add to Wishlist is not work
+Fixed A bug inside catalog/model/product/Api.php::create prevents this function from working
+- Added $store parameter.
+Fixed CSS Merger Cache Ignores Hostname and HTTPS
+- on frontend when "Use Secure URLs in Frontend" is set to "yes", https is used only for some selected pages. This fix takes into account what's the protocol in use
+Fixed Improvement to block caching
+Fixed Typo in Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::savePrices()
+Fixed Shipping creation for bundle product shows wrong q-ty
+Fixed Check for controller instance in rating option resource model
+Fixed Export Filters are not working correctly during export of customers
+Fixed Function "Apply Tax On - Original price only" does not correct calculate product tax
+Fixed Mage_Index.csv is not used at all
+Fixed Incorrect tax count, when making new order through back-end and using discount coupon (price cart rule)
+Fixed Error "Source file moving failed" on Import process, when PHP version is 5.2
+Fixed "Store credit amount can not exceed order amount" error in Credit Memo applying to Store Credit for decimal quantities and decimal subtotals
+Fixed Disabled cookie message issue
+Fixed Edit Order without creating new one functionality doesn't save changes in non-default customer address attributes
+Fixed Unable to buy Downloadable product with specified option "Links can be purchased separately" set to "No"
+Fixed Incorrect message of soap fault
+Fixed Information about Gift Options is not stored, when admin user performs Edit Order action in backend
+Fixed Unable to open "View all wishlist items" link from email
+- Added action to add shared wishlist item to shopping cart
+Fixed iFrame must be centered for Website Payments Pro Hosted Solution payment method.
+Fixed Free shipping does not transfer to Google Checkout when it is enabled in a shipping method
+- Added support of UPS carrier methods with UPS XML type of rates calculation
+Fixed Incorrect tax summary for partial credit memos/invoices
+Fixed PayPal Standart: order has two invoice and two refund
+Fixed A product hasn't been added to whishlist from category with closed, upcoming events
+Fixed Customer password is not imported from CSV file
+Fixed CDN - necessary to replace information message
+Fixed When put values in Customer Name and Address Options they do not reflect on the backend customer and customer address forms
+Fixed Reports-> Products-> Products ordered - Trace appeared
+Fixed Mage_Core_Helper_Url::getCurrentUrl() method ignores server PORT
+Fixed No ability to change payment from Store Credits, when customer backs to a Cart from Order Review step, and then goes to checkout again (OnePageCheckout)
+Fixed Customer attribute labels not translated in validation error messages
+- added translation for attribute labels at classes Mage_Customer_Model_Attribute_Data_*
+Fixed Typos in: Varien_Db_Adapter_Pdo_Mysql, Varien_File_Uploader
+Fixed Mage_Core_Model_Design_Package::_prepareUrl() uses incorrect regular expression to check whether the url is relative
+- modified preg_match for detecting absolute urls
+Fixed Mage_Catalog_Block_Product_Gallery::getImageWidth() returns false for images with width smaller than 600px
+- modified method Mage_Catalog_Block_Product_Gallery::getImageWidth(), if width <= 600 return width value, not false
+Fixed Incorrect view of the shipping tax at the back end, unnecessary $0.01
+Fixed Wrong visualisation of "Original Price" in placed order
+- collecting totals for quote at multishipping checkout
+Fixed Incorrect view of popup windows for composite product on backend (only IE)
+Added Adding Composite Products in Admin Order Creation
+- Fixed styles in ie7
+Fixed "Items Ordered" tab is not refreshing while Admin order creation
+Fixed Free shipping does not transfer to Google Checkout when it is enabled in a shipping method
+- Re factored and optimized code
+- Improved performance
+- Added dependency for GoogleCheckout module from Usa module
+- Added fedex and usps free methods supporting
+
+
+==== 1.5.x-devel-100810 ====
+
+=== Fixes ===
+
+Fixed Shopping Cart Price Rule->Conditions->Shipping Country is not correctly controlled on multiple checkout.
+Fixed Moneybookers Multistore System Configuration
+Fixed Moneybookers OBT Defaults
+Fixed Product info API request
+- a behavior of the function, was optimized;
+- refactoring classes with calling function from helper without changing the inside logic;
+- duplicated code were moved to catalog/product helper with creating the new one function for that.
+Fixed Poor randomness of auto-generated passwords in Customer Model
+- was used function from core helper;
+- code style has been formatted.
+Fixed several probable vulnerabilities on front and backend
+Fixed typos in adminhtml widget form block
+- Changed reserved word 'const' to lower case in tax config model
+Fixed Google Base Synchronize
+- Fixed fatal error on very first Publish and then Synchronizing if in GB products already were
+- Fixed potential fatal when on mass Publish action we will not retrieve any item id: expected array, but null or empty string given
+Fixed Rounding issues in shipping methods and in sales payment
+Fixed Usage of non-mb-supported strlen() in custom option validation 
+- fixed length calculation routine to work with multi-byte characters
+- changed order of evaluation, so that length is calculated only if length constraint is set for custom option
+Fixed Unused class Mage_Reports_Model_Mysql4_Shopcart_Product_Collection did not marked like deprecated 
+- mark class as deprecated after 1.5.0.1
+
+
+==== 1.5.x-devel-100247 ====
+
+=== Improvements ===
+Implemented GiftMessage API Faults
+- added faults in functions
+- added description in api.xml
+Implemented The names of WPPHS depend on a merchant`s country in the backend. Create a functionality for dynamic changing.
+- Added functionality for dynamic changing the names of WPPHS
+- Added backend config into system.xml
+
+=== Fixes ===
+Fixed Products prepare function
+- Change prepare products function
+- Update resource with phpDoc
+- Update wsdl
+Improved Faults in Shopping Cart
+- all faults for ShoppingCart are unique for each issue and have wide description
+Fixed Shopping Cart create order should return order increment id
+- updated wsdl, wsi
+- changed return type for Mage_Checkout_Model_Cart_Api::createOrder
+Fixed Grouped product has no configured price in Wishlist
+Fixed Unable to continue checkout when "Street Address" use non english characters
+Fixed Misprint in comment in Mage_Checkout_Model_Cart::init()
+Fixed Controllers used protected properties
+- removed protected property _hasDataChanges equals true in controllers
+- added property _hasDataChanges equals true in method "addComment" for all objects
+Fixed Page "404 Not Found" is showed by clicked Edit link in the Invoice page of placed order
+Fixed probably XSS vulnerabilities in backend
+Fixed Google Base Synchronize
+Fixed probably SQL-injection in backend
+Fixed Error on Authorize.net Direct Post payment method in Backend
+Fixed API default/SOAP functionality switched
+- removed unused variable loading
+- changed loading default api handler in IndexController
+- added loading default "soap" api handler in SoapController
+Fixed Missed unique index on eav table
+Fixed Its possible to add&proceed to checkout with any product from the catalog no matter website its assign to.
+Fixed Order status visible_on_front flag in configuration file can't be overridden
+Fixed Unexpected error message appears when quantity to refund more than quantity invoiced
+Fixed PayPal payment methods are not shown on the checkout Payment Information step if Brazilian Real is set as base currency
+- Added new supported currency codes into config
+Fixed Trim value after explode
+Fixed Unable to save customer date attribute with date more then 2010
+Fixed No customer's information
+Fixed PayPal Business Email address update
+
+
+==== 1.5.x-devel-97859 ====
+
+=== Improvements ===
+Implemented WS-I for API
+- added wsi.xml for all WebAPI modules
+- added new wsi-soap handler
+- added new wsi-soap adapter
+- changed admin configuration, added parameter into "Magento Core API"->WSI Compliance
+- changed api.xml
+Implemented GiftMessage for Cart
+
+== Fixes ===
+Fixed probable abuse with image re-size functionality on frontend
+Fixed Hovering mouse cursor on "Configure" button for a composite product shows incorrect hint
+Fixed Error in fulltext search indexation for values that contain 'à' character
+- modified regular expression to correct process of unicode characters
+Fixed Zooming don't work for an image larger or taller than the container
+Fixed Variable  is used before its definition in Mage_CatalogRule_Helper_Data::calcPriceRule()
+Fixed Typo in app\design\frontend\base\default\template\checkout\success.phtml
+Fixed Fatal error during newsletters sending via cron
+- Also added missed PHP-docs to Mage_Newsletter_Model_Problem class.
+Fixed Quantity of bundle item is not stored correctly, in case when it is decimal
+Fixed Unable to change configurable product name for store view
+- the bug was in two HTML input tags with same names located on "General" and "Associated Products" tabs. One of them was been renamed to solve the problem.
+Fixed Microsoft Excel 2007 fails to open Magento generated XML file
+Fixed several probable XSS issues on front end and backend
+Fixed probable SQL injection on frontend
+Fixed Admin page - incorrect displaying of pop-up message for gift options in Items Ordered block
+Fixed One extra unnecessary product appears in Items Ordered list of placed Order, when payment is provided using Authorize.net Direct Post
+Fixed If 3D Secure Card Validation is enabled then Gift Options section has wrong position during backend order creation
+Fixed Reindex of Category Products for large catalogs is extremely slow
+Fixed Product minimum quantity, add to cart
+Fixed Created in Backend customer doubled after creation order for him and not save any addres information
+Fixed Changes to helper text for the images for the application submission page
+Fixed Redirect patch
+Fixed product list images for iPad device to use base image
+Fixed Sending invoice email don`t change the status
+Fixed remove paypal country id hard coded
+Fixed Mobile Controller issue
+Fixed App locations (countries) do not match iTunes App Stores countries available
+Fixed Disabled cookie message issue
+Fixed Information about Gift Options is not stored, when admin user performs Edit Order action in backend
+Fixed Web form with empty fields can be saved - also is_object() calls are replaced with instanceof checking inside of Adminhtml/MobileController
+Fixed Bundle product with required option must have "Configure" button inactive if one of the option is out of stock.
+Fixed Unable to retrieve product attributes, "Unsupported operand types"
+Fixed Add to Wishlist is not work
+Fixed A bug inside catalog/model/product/Api.php::create prevents this function from working
+- Added $store parameter.
+Fixed CSS Merger Cache Ignores Hostname and HTTPS
+- on frontend when "Use Secure URLs in Frontend" is set to "yes", https is used only for some selected pages. This fix takes into account what's the protocol in use
+Fixed Improvement to block caching
+Fixed Typo in Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Type_Configurable_Attribute::savePrices()
+Fixed Shipping creation for bundle product shows wrong q-ty
+Fixed Check for controller instance in rating option resource model
+Fixed Export Filters are not working correctly during export of customers
+Fixed Function "Apply Tax On - Original price only" does not correct calculate product tax
+Fixed Mage_Index.csv is not used at all
+Fixed Incorrect tax count, when making new order through back-end and using discount coupon (price cart rule)
+Fixed Error "Source file moving failed" on Import process, when PHP version is 5.2
+Fixed "Store credit amount can not exceed order amount" error in Credit Memo applying to Store Credit for decimal quantities and decimal subtotals
+Fixed Disabled cookie message issue
+Fixed Edit Order without creating new one functionality doesn't save changes in non-default customer address attributes
+Fixed Unable to buy Downloadable product with specified option "Links can be purchased separately" set to "No"
+Fixed Incorrect message of soap fault
+Fixed Information about Gift Options is not stored, when admin user performs Edit Order action in backend
+Fixed Unable to open "View all wishlist items" link from email
+- Added action to add shared wishlist item to shopping cart
+Fixed iFrame must be centered for Website Payments Pro Hosted Solution payment method.
+Fixed Free shipping does not transfer to Google Checkout when it is enabled in a shipping method
+- Added support of UPS carrier methods with UPS XML type of rates calculation
+Fixed Incorrect tax summary for partial credit memos/invoices
+Fixed PayPal Standart: order has two invoice and two refund
+Fixed A product hasn't been added to whishlist from category with closed, upcoming events
+Fixed Customer password is not imported from CSV file
+Fixed CDN - necessary to replace information message
+Fixed When put values in Customer Name and Address Options they do not reflect on the backend customer and customer address forms
+Fixed Reports-> Products-> Products ordered - Trace appeared
+
+
+==== 1.5.x-devel-96719 ====
+
+=== Fixes ===
+Fixed Mage_Core_Helper_Url::getCurrentUrl() method ignores server PORT
+Fixed No ability to change payment from Store Credits, when customer backs to a Cart from Order Review step, and then goes to checkout again (OnePageCheckout)
+Fixed Customer attribute labels not translated in validation error messages
+- added translation for attribute labels at classes Mage_Customer_Model_Attribute_Data_*
+Fixed Typos in: Varien_Db_Adapter_Pdo_Mysql, Varien_File_Uploader
+Fixed Mage_Core_Model_Design_Package::_prepareUrl() uses incorrect regular expression to check whether the url is relative
+- modified preg_match for detecting absolute urls
+Fixed Mage_Catalog_Block_Product_Gallery::getImageWidth() returns false for images with width smaller than 600px
+- modified method Mage_Catalog_Block_Product_Gallery::getImageWidth(), if width <= 600 return width value, not false
+Fixed Incorrect view of the shipping tax at the back end, unnecessary $0.01
+Fixed Wrong visualisation of "Original Price" in placed order
+- collecting totals for quote at multishipping checkout
+Fixed Incorrect view of popup windows for composite product on backend (only IE)
+Added Adding Composite Products in Admin Order Creation
+- Fixed styles in ie7
+Fixed "Items Ordered" tab is not refreshing while Admin order creation
+Fixed Free shipping does not transfer to Google Checkout when it is enabled in a shipping method
+- Re factored and optimized code
+- Improved performance
+- Fixed typos
+- Added dependency for GoogleCheckout module from Usa module 
+- Added fedex and usps free methods supporting
+
+
 ==== 1.5.0.1 =====
 
 === Major Highlights ===
diff --git a/app/Mage.php b/app/Mage.php
index 44e78c1f1f..0c765b62cc 100644
--- a/app/Mage.php
+++ b/app/Mage.php
@@ -152,8 +152,8 @@ public static function getVersionInfo()
         return array(
             'major'     => '1',
             'minor'     => '5',
-            'revision'  => '0',
-            'patch'     => '1',
+            'revision'  => '1',
+            'patch'     => '0',
             'stability' => '',
             'number'    => '',
         );
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Event.php b/app/code/community/Phoenix/Moneybookers/Model/Event.php
index e6f3a8c838..81409dc451 100644
--- a/app/code/community/Phoenix/Moneybookers/Model/Event.php
+++ b/app/code/community/Phoenix/Moneybookers/Model/Event.php
@@ -204,14 +204,19 @@ protected function _validateEventData($fullCheck = true)
 
         // check order ID
         if (empty($params['transaction_id'])
-            || ($fullCheck == false && $this->_getCheckout()->getMoneybookersRealOrderId() != $params['transaction_id']))
-        {
+            || ($fullCheck == false && $this->_getCheckout()->getMoneybookersRealOrderId() != $params['transaction_id'])
+        ) {
             Mage::throwException('Missing or invalid order ID.');
         }
         // load order for further validation
         $this->_order = Mage::getModel('sales/order')->loadByIncrementId($params['transaction_id']);
-        if (!$this->_order->getId())
+        if (!$this->_order->getId()) {
             Mage::throwException('Order not found.');
+        }
+
+        if (0 !== strpos($this->_order->getPayment()->getMethodInstance()->getCode(), 'moneybookers_')) {
+            Mage::throwException('Unknown payment method.');
+        }
 
         // make additional validation
         if ($fullCheck) {
@@ -229,9 +234,20 @@ protected function _validateEventData($fullCheck = true)
             $md5String = '';
             foreach ($checkParams as $key) {
                 if ($key == 'merchant_id') {
-                    $md5String .= Mage::getStoreConfig(Phoenix_Moneybookers_Helper_Data::XML_PATH_CUSTOMER_ID, $this->_order->getStoreId());
+                    $md5String .= Mage::getStoreConfig(Phoenix_Moneybookers_Helper_Data::XML_PATH_CUSTOMER_ID,
+                        $this->_order->getStoreId()
+                    );
                 } elseif ($key == 'secret') {
-                    $md5String .= strtoupper(md5(Mage::getStoreConfig(Phoenix_Moneybookers_Helper_Data::XML_PATH_SECRET_KEY, $this->_order->getStoreId())));
+                    $secretKey = Mage::getStoreConfig(
+                        Phoenix_Moneybookers_Helper_Data::XML_PATH_SECRET_KEY,
+                        $this->_order->getStoreId()
+                    );
+
+                    if (empty($secretKey)) {
+                        Mage::throwException('Secret key is empty.');
+                    }
+
+                    $md5String .= strtoupper(md5($secretKey));
                 } elseif (isset($params[$key])) {
                     $md5String .= $params[$key];
                 }
diff --git a/app/code/community/Phoenix/Moneybookers/etc/config.xml b/app/code/community/Phoenix/Moneybookers/etc/config.xml
index 377626863c..b76a5e02e2 100644
--- a/app/code/community/Phoenix/Moneybookers/etc/config.xml
+++ b/app/code/community/Phoenix/Moneybookers/etc/config.xml
@@ -293,7 +293,8 @@
                 <active>0</active>
                 <model>moneybookers/obt</model>
                 <title>Onlineüberweisung (empfohlen)</title>
-                <allowspecific>0</allowspecific>
+                <allowspecific>1</allowspecific>
+                <specificcountry>GB,DE</specificcountry>
             </moneybookers_obt>
         </payment>
         <moneybookers>
diff --git a/app/code/community/Phoenix/Moneybookers/etc/system.xml b/app/code/community/Phoenix/Moneybookers/etc/system.xml
index 06f71be304..6247d9be10 100644
--- a/app/code/community/Phoenix/Moneybookers/etc/system.xml
+++ b/app/code/community/Phoenix/Moneybookers/etc/system.xml
@@ -35,8 +35,8 @@
                     <frontend_type>text</frontend_type>
                     <sort_order>1</sort_order>
                     <show_in_default>1</show_in_default>
-                    <show_in_website>0</show_in_website>
-                    <show_in_store>0</show_in_store>
+                    <show_in_website>1</show_in_website>
+                    <show_in_store>1</show_in_store>
                     <fields>
                         <moneybookers_email translate="label,comment">
                             <label>Email Address of Your Moneybookers Account</label>
@@ -44,16 +44,16 @@
                             <frontend_type>text</frontend_type>
                             <sort_order>1</sort_order>
                             <show_in_default>1</show_in_default>
-                            <show_in_website>0</show_in_website>
-                            <show_in_store>0</show_in_store>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
                         </moneybookers_email>
                         <customer_id translate="label">
                             <label>Customer ID</label>
                             <frontend_type>text</frontend_type>
                             <sort_order>2</sort_order>
                             <show_in_default>1</show_in_default>
-                            <show_in_website>0</show_in_website>
-                            <show_in_store>0</show_in_store>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
                         </customer_id>
                         <secret_key translate="label,comment">
                             <label>Secret Word</label>
@@ -61,16 +61,16 @@
                             <frontend_type>text</frontend_type>
                             <sort_order>3</sort_order>
                             <show_in_default>1</show_in_default>
-                            <show_in_website>0</show_in_website>
-                            <show_in_store>0</show_in_store>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
                         </secret_key>
                         <activationstatus>
                             <comment></comment>
                             <frontend_type>text</frontend_type>
                             <sort_order>4</sort_order>
                             <show_in_default>1</show_in_default>
-                            <show_in_website>0</show_in_website>
-                            <show_in_store>0</show_in_store>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
                         </activationstatus>
                     </fields>
                 </settings>
diff --git a/app/code/core/Mage/Admin/Model/Mysql4/User.php b/app/code/core/Mage/Admin/Model/Mysql4/User.php
index 386d7eb8fd..ec83b8aab9 100644
--- a/app/code/core/Mage/Admin/Model/Mysql4/User.php
+++ b/app/code/core/Mage/Admin/Model/Mysql4/User.php
@@ -209,7 +209,9 @@ public function getRoles(Mage_Core_Model_Abstract $user)
         $table  = $this->getTable('admin/role');
         $read   = $this->_getReadAdapter();
         $select = $read->select()->from($table, array())
-                    ->joinLeft(array('ar' => $table), "(ar.role_id = `{$table}`.parent_id and ar.role_type = 'G')", array('role_id'))
+                    ->joinLeft(array('ar' => $table),
+                        "(ar.role_id = `{$table}`.parent_id and ar.role_type = 'G')",
+                        array('role_id'))
                     ->where("`{$table}`.user_id = {$user->getId()}");
 
         return (($roles = $read->fetchCol($select)) ? $roles : array());
@@ -253,7 +255,8 @@ public function deleteFromRole(Mage_Core_Model_Abstract $user)
             return $this;
         }
         $dbh = $this->_getWriteAdapter();
-        $condition = "`{$this->getTable('admin/role')}`.user_id = ".$dbh->quote($user->getUserId())." AND `{$this->getTable('admin/role')}`.parent_id = ".$dbh->quote($user->getRoleId());
+        $condition = "`{$this->getTable('admin/role')}`.user_id = " . $dbh->quote($user->getUserId())
+            . " AND `{$this->getTable('admin/role')}`.parent_id = " . $dbh->quote($user->getRoleId());
         $dbh->delete($this->getTable('admin/role'), $condition);
         return $this;
     }
@@ -274,10 +277,18 @@ public function roleUserExists(Mage_Core_Model_Abstract $user)
     public function userExists(Mage_Core_Model_Abstract $user)
     {
         $usersTable = $this->getTable('admin/user');
-        $select = $this->_getReadAdapter()->select();
-        $select->from($usersTable);
-        $select->where("({$usersTable}.username = '{$user->getUsername()}' OR {$usersTable}.email = '{$user->getEmail()}') AND {$usersTable}.user_id != '{$user->getId()}'");
-        return $this->_getReadAdapter()->fetchRow($select);
+        $db = $this->_getReadAdapter();
+
+        $select = $db->select()
+            ->from(array('u' => $usersTable))
+            ->where('u.user_id != ?', (int) $user->getId())
+            ->where('u.username = :username OR u.email = :email')
+        ;
+        $row = $db->fetchRow($select, array(
+            ':username' => $user->getUsername(),
+            ':email'    => $user->getUsername(),
+        ));
+        return $row;
     }
 
     public function saveExtra($object, $data)
diff --git a/app/code/core/Mage/Admin/Model/Session.php b/app/code/core/Mage/Admin/Model/Session.php
index 7cbebe1112..6e1fe5d941 100644
--- a/app/code/core/Mage/Admin/Model/Session.php
+++ b/app/code/core/Mage/Admin/Model/Session.php
@@ -90,6 +90,7 @@ public function login($username, $password, $request = null)
             $user = Mage::getModel('admin/user');
             $user->login($username, $password);
             if ($user->getId()) {
+                $this->renewSession();
 
                 if (Mage::getSingleton('adminhtml/url')->useSecretKey()) {
                     Mage::getSingleton('adminhtml/url')->renewSecretUrls();
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php
index e6433bd5e2..44c3b4887b 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php
@@ -79,6 +79,7 @@ protected function _prepareForm()
                     continue;
                 }
                 $attributeCode = $attribute->getAttributeCode();
+                $attribute->setAttributeCode('simple_product_' . $attributeCode);
                 $element = $fieldset->addField(
                     'simple_product_' . $attributeCode,
                      $inputType,
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php
index 74a3bcfad9..c1e7d31a5e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php
@@ -77,6 +77,46 @@ public function initForm()
 //            $customer->setWebsiteId(Mage::app()->getStore(true)->getWebsiteId());
 //        }
 
+        $customerStoreId = null;
+        if ($customer->getId()) {
+            $customerStoreId = Mage::app()->getWebsite($customer->getWebsiteId())->getDefaultStore()->getId();
+        }
+
+        $prefixElement = $form->getElement('prefix');
+        if ($prefixElement) {
+            $prefixOptions = $this->helper('customer')->getNamePrefixOptions($customerStoreId);
+            if (!empty($prefixOptions)) {
+                $fieldset->removeField($prefixElement->getId());
+                $prefixField = $fieldset->addField($prefixElement->getId(),
+                    'select',
+                    $prefixElement->getData(),
+                    $form->getElement('group_id')->getId()
+                );
+                $prefixField->setValues($prefixOptions);
+                if ($customer->getId()) {
+                    $prefixField->addElementValues($customer->getPrefix());
+                }
+
+            }
+        }
+
+        $suffixElement = $form->getElement('suffix');
+        if ($suffixElement) {
+            $suffixOptions = $this->helper('customer')->getNameSuffixOptions($customerStoreId);
+            if (!empty($suffixOptions)) {
+                $fieldset->removeField($suffixElement->getId());
+                $suffixField = $fieldset->addField($suffixElement->getId(),
+                    'select',
+                    $suffixElement->getData(),
+                    $form->getElement('lastname')->getId()
+                );
+                $suffixField->setValues($suffixOptions);
+                if ($customer->getId()) {
+                    $suffixField->addElementValues($customer->getSuffix());
+                }
+            }
+        }
+
         if ($customer->getId()) {
             if (!$customer->isReadonly()) {
                 // add password management fieldset
@@ -156,12 +196,16 @@ public function initForm()
 
         $prefix = $form->getHtmlIdPrefix();
         if ($sendEmail) {
+            $_disableStoreField = '';
+            if (!$isSingleMode) {
+                $_disableStoreField = "$('{$prefix}sendemail_store_id').disabled=(''==this.value || '0'==this.value);";
+            }
             $sendEmail->setAfterElementHtml(
                 '<script type="text/javascript">'
                 . "
                 $('{$prefix}website_id').disableSendemail = function() {
                     $('{$prefix}sendemail').disabled = ('' == this.value || '0' == this.value);".
-                    ($isSingleMode ? "" : "$('{$prefix}sendemail_store_id').disabled = ('' == this.value || '0' == this.value);")
+                    $_disableStoreField
                 ."}.bind($('{$prefix}website_id'));
                 Event.observe('{$prefix}website_id', 'change', $('{$prefix}website_id').disableSendemail);
                 $('{$prefix}website_id').disableSendemail();
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
index cf82e91458..ce7c8d3458 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
@@ -150,6 +150,39 @@ public function initForm()
             }
         }
 
+        $customerStoreId = null;
+        if ($customer->getId()) {
+            $customerStoreId = Mage::app()->getWebsite($customer->getWebsiteId())->getDefaultStore()->getId();
+        }
+
+        $prefixElement = $form->getElement('prefix');
+        if ($prefixElement) {
+            $prefixOptions = $this->helper('customer')->getNamePrefixOptions($customerStoreId);
+            if (!empty($prefixOptions)) {
+                $fieldset->removeField($prefixElement->getId());
+                $prefixField = $fieldset->addField($prefixElement->getId(),
+                    'select',
+                    $prefixElement->getData(),
+                    '^'
+                );
+                $prefixField->setValues($prefixOptions);
+            }
+        }
+
+        $suffixElement = $form->getElement('suffix');
+        if ($suffixElement) {
+            $suffixOptions = $this->helper('customer')->getNameSuffixOptions($customerStoreId);
+            if (!empty($suffixOptions)) {
+                $fieldset->removeField($suffixElement->getId());
+                $suffixField = $fieldset->addField($suffixElement->getId(),
+                    'select',
+                    $suffixElement->getData(),
+                    $form->getElement('lastname')->getId()
+                );
+                $suffixField->setValues($suffixOptions);
+            }
+        }
+
         $addressCollection = $customer->getAddresses();
         $this->assign('customer', $customer);
         $this->assign('addressCollection', $addressCollection);
@@ -196,9 +229,39 @@ public function getDefaultCountriesJson() {
         $websites = Mage::getSingleton('adminhtml/system_store')->getWebsiteValuesForForm(false, true);
         $result = array();
         foreach ($websites as $website) {
-            $result[$website['value']] = Mage::app()->getWebsite($website['value'])->getConfig(Mage_Core_Helper_Data::XML_PATH_DEFAULT_COUNTRY);
+            $result[$website['value']] = Mage::app()->getWebsite($website['value'])->getConfig(
+                Mage_Core_Helper_Data::XML_PATH_DEFAULT_COUNTRY
+            );
         }
 
         return Mage::helper('core')->jsonEncode($result);
     }
+
+    /**
+     * Add specified values to name prefix element values
+     *
+     * @param string|int|array $values
+     * @return Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses
+     */
+    public function addValuesToNamePrefixElement($values)
+    {
+        if ($this->getForm() && $this->getForm()->getElement('prefix')) {
+            $this->getForm()->getElement('prefix')->addElementValues($values);
+        }
+        return $this;
+    }
+
+    /**
+     * Add specified values to name suffix element values
+     *
+     * @param string|int|array $values
+     * @return Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses
+     */
+    public function addValuesToNameSuffixElement($values)
+    {
+        if ($this->getForm() && $this->getForm()->getElement('suffix')) {
+            $this->getForm()->getElement('suffix')->addElementValues($values);
+        }
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
index 877f7f7cfc..e4da7cf8ea 100644
--- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
+++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
@@ -29,50 +29,136 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author     Magento Core Team <core@magentocommerce.com>
  */
 
 class Mage_Adminhtml_Block_Dashboard_Graph extends Mage_Adminhtml_Block_Dashboard_Abstract
 {
+    /**
+     * Api URL
+     */
+    const API_URL = 'http://chart.apis.google.com/chart';
+
+    /**
+     * All series
+     *
+     * @var array
+     */
     protected $_allSeries = array();
+
+    /**
+     * Axis labels
+     *
+     * @var array
+     */
     protected $_axisLabels = array();
+
+    /**
+     * Axis maps
+     *
+     * @var array
+     */
     protected $_axisMaps = array();
 
+    /**
+     * Data rows
+     *
+     * @var array
+     */
     protected $_dataRows = array();
 
+    /**
+     * Simple encoding chars
+     *
+     * @var string
+     */
     protected $_simpleEncoding = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-    protected $_extendedEncoding = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-.';
 
-    const API_URL = 'http://chart.apis.google.com/chart';
+    /**
+     * Extended encoding chars
+     *
+     * @var string
+     */
+    protected $_extendedEncoding = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-.';
 
+    /**
+     * Chart width
+     *
+     * @var string
+     */
     protected $_width = '587';
+
+    /**
+     * Chart height
+     *
+     * @var string
+     */
     protected $_height = '300';
-    // Google Chart Api Data Encoding
+
+    /**
+     * Google chart api data encoding
+     *
+     * @var string
+     */
     protected $_encoding = 'e';
 
+    /**
+     * Html identifier
+     *
+     * @var string
+     */
     protected $_htmlId = '';
 
+    /**
+     * Initialize object
+     *
+     * @return void
+     */
     public function __construct()
     {
         parent::__construct();
         $this->setTemplate('dashboard/graph.phtml');
     }
 
+    /**
+     * Get tab template
+     *
+     * @return string
+     */
     protected function _getTabTemplate()
     {
         return 'dashboard/graph.phtml';
     }
 
+    /**
+     * Set data rows
+     *
+     * @param mixed $rows
+     * @return void
+     */
     public function setDataRows($rows)
     {
         $this->_dataRows = (array)$rows;
     }
 
+    /**
+     * Add series
+     *
+     * @param string $seriesId
+     * @param array $options
+     * @return void
+     */
     public function addSeries($seriesId, array $options)
     {
         $this->_allSeries[$seriesId] = $options;
     }
 
+    /**
+     * Get series
+     *
+     * @param string $seriesId
+     * @return mixed
+     */
     public function getSeries($seriesId)
     {
         if (isset($this->_allSeries[$seriesId])) {
@@ -82,11 +168,22 @@ public function getSeries($seriesId)
         }
     }
 
+    /**
+     * Get all series
+     *
+     * @return array
+     */
     public function getAllSeries()
     {
         return $this->_allSeries;
     }
 
+    /**
+     * Get chart url
+     *
+     * @param bool $directUrl
+     * @return string
+     */
     public function getChartUrl($directUrl = true)
     {
         $params = array(
@@ -247,7 +344,8 @@ public function getChartUrl($directUrl = true)
                         }
                         $firstchar = floor($ylocation / 64);
                         $secondchar = $ylocation % 64;
-                        $mappedchar = substr($this->_extendedEncoding, $firstchar, 1) . substr($this->_extendedEncoding, $secondchar, 1);
+                        $mappedchar = substr($this->_extendedEncoding, $firstchar, 1)
+                            . substr($this->_extendedEncoding, $secondchar, 1);
                         array_push($chartdata, $mappedchar . $dataDelimiter);
                     } else {
                         array_push($chartdata, $dataMissing . $dataDelimiter);
@@ -346,6 +444,13 @@ public function getChartUrl($directUrl = true)
         }
     }
 
+    /**
+     * Get rows data
+     *
+     * @param array $attributes
+     * @param bool $single
+     * @return array
+     */
     protected function getRowsData($attributes, $single = false)
     {
         $items = $this->getCollection()->getItems();
@@ -362,25 +467,45 @@ protected function getRowsData($attributes, $single = false)
         return $options;
     }
 
-
+    /**
+     * Set axis labels
+     *
+     * @param string $axis
+     * @param array $labels
+     * @return void
+     */
     public function setAxisLabels($axis, $labels)
     {
         $this->_axisLabels[$axis] = $labels;
     }
 
-
+    /**
+     * Set html id
+     *
+     * @param string $htmlId
+     * @return void
+     */
     public function setHtmlId($htmlId)
     {
         $this->_htmlId = $htmlId;
     }
 
-
+    /**
+     * Get html id
+     *
+     * @return string
+     */
     public function getHtmlId()
     {
         return $this->_htmlId;
     }
 
-
+    /**
+     * Return pow
+     *
+     * @param int $number
+     * @return int
+     */
     protected function _getPow($number)
     {
         $pow = 0;
@@ -391,15 +516,38 @@ protected function _getPow($number)
         return $pow;
     }
 
-
+    /**
+     * Return chart width
+     *
+     * @return string
+     */
     protected function getWidth()
     {
         return $this->_width;
     }
 
-
+    /**
+     * Return chart height
+     *
+     * @return string
+     */
     protected function getHeight()
     {
         return $this->_height;
     }
+
+    /**
+     * Prepare chart data
+     *
+     * @return void
+     */
+    protected function _prepareData()
+    {
+        $availablePeriods = array_keys($this->helper('adminhtml/dashboard_data')->getDatePeriods());
+        $period = $this->getRequest()->getParam('period');
+
+        $this->getDataHelper()->setParam('period',
+            ($period && in_array($period, $availablePeriods)) ? $period : '24h'
+        );
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php
index 8a39baeb39..313a4d7844 100644
--- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php
+++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php
@@ -29,32 +29,39 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author     Magento Core Team <core@magentocommerce.com>
  */
 
 class Mage_Adminhtml_Block_Dashboard_Tab_Amounts extends Mage_Adminhtml_Block_Dashboard_Graph
 {
+    /**
+     * Initialize object
+     *
+     * @return void
+     */
     public function __construct()
     {
         $this->setHtmlId('amounts');
         parent::__construct();
     }
 
+    /**
+     * Prepare chart data
+     *
+     * @return void
+     */
     protected function _prepareData()
     {
         $this->setDataHelperName('adminhtml/dashboard_order');
         $this->getDataHelper()->setParam('store', $this->getRequest()->getParam('store'));
         $this->getDataHelper()->setParam('website', $this->getRequest()->getParam('website'));
         $this->getDataHelper()->setParam('group', $this->getRequest()->getParam('group'));
-        $this->getDataHelper()->setParam(
-            'period',
-            $this->getRequest()->getParam('period')?$this->getRequest()->getParam('period'):'24h'
-            );
 
         $this->setDataRows('revenue');
         $this->_axisMaps = array(
             'x' => 'range',
-            'y' => 'revenue');
+            'y' => 'revenue'
+        );
 
         parent::_prepareData();
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php
index 706c1d4c51..2c6fe207e5 100644
--- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php
+++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php
@@ -29,32 +29,39 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author     Magento Core Team <core@magentocommerce.com>
  */
 
 class Mage_Adminhtml_Block_Dashboard_Tab_Orders extends Mage_Adminhtml_Block_Dashboard_Graph
 {
+    /**
+     * Initialize object
+     *
+     * @return void
+     */
     public function __construct()
     {
         $this->setHtmlId('orders');
         parent::__construct();
     }
 
+    /**
+     * Prepare chart data
+     *
+     * @return void
+     */
     protected function _prepareData()
     {
         $this->setDataHelperName('adminhtml/dashboard_order');
         $this->getDataHelper()->setParam('store', $this->getRequest()->getParam('store'));
         $this->getDataHelper()->setParam('website', $this->getRequest()->getParam('website'));
         $this->getDataHelper()->setParam('group', $this->getRequest()->getParam('group'));
-        $this->getDataHelper()->setParam(
-            'period',
-            $this->getRequest()->getParam('period')?$this->getRequest()->getParam('period'):'24h'
-            );
 
         $this->setDataRows('quantity');
         $this->_axisMaps = array(
             'x' => 'range',
-            'y' => 'quantity');
+            'y' => 'quantity'
+        );
 
         parent::_prepareData();
     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php
index b1b8667e7c..83e258f814 100644
--- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php
@@ -24,7 +24,15 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class Mage_Adminhtml_Block_Permissions_Tab_Rolesedit extends Mage_Adminhtml_Block_Widget_Form implements Mage_Adminhtml_Block_Widget_Tab_Interface
+/**
+ * Rolesedit Tab Display Block
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Adminhtml_Block_Permissions_Tab_Rolesedit extends Mage_Adminhtml_Block_Widget_Form
+    implements Mage_Adminhtml_Block_Widget_Tab_Interface
 {
     /**
      * Get tab label
@@ -66,6 +74,10 @@ public function isHidden()
         return false;
     }
 
+    /**
+     * Class constructor
+     *
+     */
     public function __construct()
     {
         parent::__construct();
@@ -79,9 +91,10 @@ public function __construct()
         $selrids = array();
 
         foreach ($rules_set->getItems() as $item) {
-            if (array_key_exists(strtolower($item->getResource_id()), $resources) && $item->getPermission() == 'allow') {
-                $resources[$item->getResource_id()]['checked'] = true;
-                array_push($selrids, $item->getResource_id());
+            $itemResourceId = $item->getResource_id();
+            if (array_key_exists(strtolower($itemResourceId), $resources) && $item->getPermission() == 'allow') {
+                $resources[$itemResourceId]['checked'] = true;
+                array_push($selrids, $itemResourceId);
             }
         }
 
@@ -92,11 +105,21 @@ public function __construct()
         //->assign('checkedResources', join(',', $selrids));
     }
 
+    /**
+     * Check if everything is allowed
+     *
+     * @return boolean
+     */
     public function getEverythingAllowed()
     {
         return in_array('all', $this->getSelectedResources());
     }
 
+    /**
+     * Get Json Representation of Resource Tree
+     *
+     * @return string
+     */
     public function getResTreeJson()
     {
         $rid = Mage::app()->getRequest()->getParam('rid', false);
@@ -109,21 +132,34 @@ public function getResTreeJson()
         return $json;
     }
 
+    /**
+     * Compare two nodes of the Resource Tree
+     *
+     * @param array $a
+     * @param array $b
+     * @return boolean
+     */
     protected function _sortTree($a, $b)
     {
         return $a['sort_order']<$b['sort_order'] ? -1 : ($a['sort_order']>$b['sort_order'] ? 1 : 0);
     }
 
-
-    protected function _getNodeJson($node, $level=0)
+    /**
+     * Get Node Json
+     *
+     * @param mixed $node
+     * @param int $level
+     * @return array
+     */
+    protected function _getNodeJson($node, $level = 0)
     {
         $item = array();
         $selres = $this->getSelectedResources();
 
         if ($level != 0) {
-            $item['text']= (string)$node->title;
-            $item['sort_order']= isset($node->sort_order) ? (string)$node->sort_order : 0;
-            $item['id']  = (string)$node->attributes()->aclpath;
+            $item['text'] = Mage::helper('adminhtml')->__((string)$node->title);
+            $item['sort_order'] = isset($node->sort_order) ? (string)$node->sort_order : 0;
+            $item['id'] = (string)$node->attributes()->aclpath;
 
             if (in_array($item['id'], $selres))
                 $item['checked'] = true;
@@ -141,7 +177,7 @@ protected function _getNodeJson($node, $level=0)
             $item['children'] = array();
             //$item['cls'] = 'fiche-node';
             foreach ($children as $child) {
-                if ($child->getName()!='title' && $child->getName()!='sort_order') {
+                if ($child->getName() != 'title' && $child->getName() != 'sort_order') {
                     if (!(string)$child->title) {
                         continue;
                     }
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php
index 570dfcf84e..7fca61c1c6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php
+++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php
@@ -40,7 +40,7 @@ public function __construct()
         $this->_controller = 'report_tag_customer_detail';
 
         $customer = Mage::getModel('customer/customer')->load($this->getRequest()->getParam('id'));
-        $customerName = $customer->getName();
+        $customerName = $this->escapeHtml($customer->getName());
         $this->_headerText = Mage::helper('reports')->__('Tags Submitted by %s', $customerName);
         parent::__construct();
         $this->_removeButton('add');
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php
index 09162c4367..0f3fd1fd36 100644
--- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php
+++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php
@@ -41,7 +41,7 @@ public function __construct()
 
         $tag = Mage::getModel('tag/tag')->load($this->getRequest()->getParam('id'));
 
-        $this->_headerText = Mage::helper('reports')->__('Tag "%s" details', $tag->getName());
+        $this->_headerText = Mage::helper('reports')->__('Tag "%s" details', $this->escapeHtml($tag->getName()));
         parent::__construct();
         $this->_removeButton('add');
         $this->setBackUrl($this->getUrl('*/report_tag/popular/'));
diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Main.php b/app/code/core/Mage/Adminhtml/Block/Review/Main.php
index 9f7cb36de4..7c34298e63 100644
--- a/app/code/core/Mage/Adminhtml/Block/Review/Main.php
+++ b/app/code/core/Mage/Adminhtml/Block/Review/Main.php
@@ -47,6 +47,7 @@ public function __construct()
         if ($customerId) {
             $customer = Mage::getModel('customer/customer')->load($customerId);
             $customerName = $customer->getFirstname() . ' ' . $customer->getLastname();
+            $customerName = $this->escapeHtml($customerName);
         }
 
         if( Mage::registry('usePendingFilter') === true ) {
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php
index 9d5bd48e1a..6aafd20956 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php
@@ -107,6 +107,41 @@ protected function _prepareForm()
 
         $this->_addAttributesToForm($addressForm->getAttributes(), $fieldset);
 
+        $prefixElement = $this->_form->getElement('prefix');
+        if ($prefixElement) {
+            $prefixOptions = $this->helper('customer')->getNamePrefixOptions($this->getStore());
+            if (!empty($prefixOptions)) {
+                $fieldset->removeField($prefixElement->getId());
+                $prefixField = $fieldset->addField($prefixElement->getId(),
+                    'select',
+                    $prefixElement->getData(),
+                    '^'
+                );
+                $prefixField->setValues($prefixOptions);
+                if ($this->getAddressId()) {
+                    $prefixField->addElementValues($this->getAddress()->getPrefix());
+                }
+            }
+        }
+
+        $suffixElement = $this->_form->getElement('suffix');
+        if ($suffixElement) {
+            $suffixOptions = $this->helper('customer')->getNameSuffixOptions($this->getStore());
+            if (!empty($suffixOptions)) {
+                $fieldset->removeField($suffixElement->getId());
+                $suffixField = $fieldset->addField($suffixElement->getId(),
+                    'select',
+                    $suffixElement->getData(),
+                    $this->_form->getElement('lastname')->getId()
+                );
+                $suffixField->setValues($suffixOptions);
+                if ($this->getAddressId()) {
+                    $suffixField->addElementValues($this->getAddress()->getSuffix());
+                }
+            }
+        }
+
+
         $regionElement = $this->_form->getElement('region_id');
         if ($regionElement) {
             $regionElement->setNoDisplay(true);
@@ -115,7 +150,9 @@ protected function _prepareForm()
         $this->_form->setValues($this->getFormValues());
 
         if (!$this->_form->getElement('country_id')->getValue()) {
-            $this->_form->getElement('country_id')->setValue(Mage::helper('core')->getDefaultCountry($this->getStore()));
+            $this->_form->getElement('country_id')->setValue(
+                Mage::helper('core')->getDefaultCountry($this->getStore())
+            );
         }
 
         return $this;
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
index 70fd8b228e..017f8f6774 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
@@ -304,14 +304,12 @@ public function getConfigureButtonHtml($item)
     {
         $product = $item->getProduct();
 
-        $options = array(
-            'label' => Mage::helper('sales')->__('Configure'),
-            'title' => Mage::helper('sales')->__('This product does not have any configurable options.')
-        );
+        $options = array('label' => Mage::helper('sales')->__('Configure'));
         if ($product->canConfigure()) {
             $options['onclick'] = sprintf('order.showQuoteItemConfiguration(%s)', $item->getId());
         } else {
             $options['class'] = ' disabled';
+            $options['title'] = Mage::helper('sales')->__('This product does not have any configurable options');
         }
 
         return $this->getLayout()->createBlock('adminhtml/widget_button')
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php
index 3a12099307..c55914c02f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php
@@ -107,6 +107,11 @@ protected function _prepareCollection()
         return parent::_prepareCollection();
     }
 
+    /**
+     * Prepare columns
+     *
+     * @return Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid
+     */
     protected function _prepareColumns()
     {
         $this->addColumn('entity_id', array(
@@ -137,7 +142,7 @@ protected function _prepareColumns()
         ));
 
         $this->addColumn('in_products', array(
-            'header'    => 'Select',
+            'header'    => Mage::helper('sales')->__('Select'),
             'header_css_class' => 'a-center',
             'type'      => 'checkbox',
             'name'      => 'in_products',
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php
index a3e7eb13bc..fa9c0cfdd6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php
@@ -40,28 +40,53 @@ class Mage_Adminhtml_Block_Sales_Order_Totals_Tax extends Mage_Tax_Block_Sales_O
      */
     public function getFullTaxInfo()
     {
+        /** @var $source Mage_Sales_Model_Order */
         $source = $this->getOrder();
         $info = array();
         if ($source instanceof Mage_Sales_Model_Order) {
+
             $rates = Mage::getModel('sales/order_tax')->getCollection()->loadByOrder($source)->toArray();
             $info  = Mage::getSingleton('tax/calculation')->reproduceProcess($rates['items']);
+
+            /**
+             * Set right tax amount from invoice
+             * (In $info tax invalid when invoice is partial)
+             */
+            /** @var $blockInvoice Mage_Adminhtml_Block_Sales_Order_Invoice_Totals */
+            $blockInvoice = $this->getLayout()->getBlock('tax');
+            /** @var $invoice Mage_Sales_Model_Order_Invoice */
+            $invoice = $blockInvoice->getSource();
+            $items = $invoice->getItemsCollection();
+            $i = 0;
+            /** @var $item Mage_Sales_Model_Order_Invoice_Item */
+            foreach ($items as $item) {
+                $info[$i]['hidden']           = $item->getHiddenTaxAmount();
+                $info[$i]['amount']           = $item->getTaxAmount();
+                $info[$i]['base_amount']      = $item->getBaseTaxAmount();
+                $info[$i]['base_real_amount'] = $item->getBaseTaxAmount();
+                $i++;
+            }
         }
-        
+
         return $info;
     }
 
     /**
-     * Display tax abount
+     * Display tax amount
      *
      * @return string
      */
     public function displayAmount($amount, $baseAmount)
     {
-        return Mage::helper('adminhtml/sales')->displayPrices($this->getSource(), $baseAmount, $amount, false, '<br />');
+        return Mage::helper('adminhtml/sales')->displayPrices(
+            $this->getSource(), $baseAmount, $amount, false, '<br />'
+        );
     }
 
     /**
      * Get store object for process configuration settings
+     *
+     * @return Mage_Core_Model_Store
      */
     public function getStore()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php
index 6b8236ac93..7711d20466 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php
@@ -158,7 +158,7 @@ public function getAddressEditLink($address, $label='')
         if (empty($label)) {
             $label = $this->__('Edit');
         }
-        $url = $this->getUrl('*/*/address', array('address_id'=>$address->getId()));
+        $url = $this->getUrl('*/sales_order/address', array('address_id'=>$address->getId()));
         return '<a href="'.$url.'">' . $label . '</a>';
     }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php
index 0322729dfa..24298ec40e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php
@@ -55,7 +55,13 @@ protected function _prepareForm()
         $product  = Mage::registry('current_product');
         $category = Mage::registry('current_category');
 
-        $form = new Varien_Data_Form(array('id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post'));
+        $form = new Varien_Data_Form(
+            array(
+                'id'        => 'edit_form',
+                'action'    => $this->getData('action'),
+                'method'    => 'post'
+            )
+        );
 
         // set form data either from model values or from session
         $formValues = array(
@@ -119,19 +125,25 @@ protected function _prepareForm()
                 }
             }
 
-            if ($stores) {
-                foreach ($stores as $i => $store) {
-                    if (isset($store['value']) && $store['value']) {
-                        $found = false;
-                        foreach ($store['value'] as $_k => $_v) {
-                            if (isset($_v['value']) && in_array($_v['value'], $entityStores)) {
-                               $found = true;
-                            } else {
-                                unset($stores[$i]['value'][$_k]);
+            /*
+             * Stores should be filtered only if product and/or category is specified.
+             * If we use custom rewrite, all stores are accepted.
+             */
+            if (($product && $product->getId()) || ($category && $category->getId())) {
+                if ($stores) {
+                    foreach ($stores as $i => $store) {
+                        if (isset($store['value']) && $store['value']) {
+                            $found = false;
+                            foreach ($store['value'] as $_k => $_v) {
+                                if (isset($_v['value']) && in_array($_v['value'], $entityStores)) {
+                                   $found = true;
+                                } else {
+                                    unset($stores[$i]['value'][$_k]);
+                                }
+                            }
+                            if (!$found) {
+                                unset($stores[$i]);
                             }
-                        }
-                        if (!$found) {
-                            unset($stores[$i]);
                         }
                     }
                 }
@@ -185,7 +197,7 @@ protected function _prepareForm()
             'value'     => $formValues['target_path'],
         ));
 
-        // auto-generate paths for new urlrewrites
+        // auto-generate paths for new url rewrites
         if (!$model->getId()) {
             $_product  = null;
             $_category = null;
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php
index e46578c585..403d22cfa2 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php
@@ -147,7 +147,7 @@ protected function _beforeToHtml()
     }
 
     /**
-     * Initialize form fileds values
+     * Initialize form fields values
      * Method will be called after prepareForm and can be used for field values initialization
      *
      * @return Mage_Adminhtml_Block_Widget_Form
@@ -201,7 +201,9 @@ protected function _setFieldset($attributes, $fieldset, $exclude=array())
                     $element->setValues($attribute->getSource()->getAllOptions(true, true));
                 } else if ($inputType == 'date') {
                     $element->setImage($this->getSkinUrl('images/grid-cal.gif'));
-                    $element->setFormat(Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT));
+                    $element->setFormat(
+                        Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT)
+                    );
                 } else if ($inputType == 'multiline') {
                     $element->setLineCount($attribute->getMultilineCount());
                 }
diff --git a/app/code/core/Mage/Adminhtml/Helper/Catalog.php b/app/code/core/Mage/Adminhtml/Helper/Catalog.php
index a626cdb940..b290844ca7 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Catalog.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Catalog.php
@@ -33,6 +33,8 @@
  */
 class Mage_Adminhtml_Helper_Catalog extends Mage_Core_Helper_Abstract
 {
+    const XML_PATH_SITEMAP_VALID_PATHS = 'general/file/sitemap_generate_valid_paths';
+
     /**
      * Attribute Tab block name for product edit
      *
@@ -90,4 +92,18 @@ public function setCategoryAttributeTabBlock($attributeTabBlock)
         $this->_categoryAttributeTabBlock = $attributeTabBlock;
         return $this;
     }
+
+    /**
+     * Get list valid paths for generate a sitemap XML file
+     *
+     * @return array
+     */
+    public function getSitemapValidPaths()
+    {
+        $path = Mage::getStoreConfig(self::XML_PATH_SITEMAP_VALID_PATHS);
+        /** @var $helper Mage_Core_Helper_Data */
+        $helper = Mage::helper('core');
+        $path = array_merge($path, $helper->getPublicFilesValidPath());
+        return $path;
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php
index dd8d83993a..8245d38541 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php
@@ -69,11 +69,11 @@ public function countStores()
     public function getDatePeriods()
     {
         return array(
-            '24h'=>$this->__('Last 24 Hours'),
-            '7d'=>$this->__('Last 7 Days'),
-            '1m'=>$this->__('Current Month'),
-            '1y'=>$this->__('YTD'),
-            '2y'=>$this->__('2YTD')
+            '24h' => $this->__('Last 24 Hours'),
+            '7d'  => $this->__('Last 7 Days'),
+            '1m'  => $this->__('Current Month'),
+            '1y'  => $this->__('YTD'),
+            '2y'  => $this->__('2YTD')
         );
     }
 
diff --git a/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php b/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php
new file mode 100644
index 0000000000..986a952c37
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+
+/**
+ * Validator for custom layout update
+ *
+ * Validator checked XML validation and protected expressions
+ *
+ * @category   Mage
+ * @package    Mage_Adminhtml
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Adminhtml_Model_LayoutUpdate_Validator extends Zend_Validate_Abstract
+{
+    const XML_INVALID                             = 'invalidXml';
+    const PROTECTED_ATTR_HELPER_IN_TAG_ACTION_VAR = 'protectedAttrHelperInActionVar';
+
+    /**
+     * The Varien SimpleXml object
+     *
+     * @var Varien_Simplexml_Element
+     */
+    protected $_value;
+
+    /**
+     * Protected expressions
+     *
+     * @var array
+     */
+    protected $_protectedExpressions = array(
+        self::PROTECTED_ATTR_HELPER_IN_TAG_ACTION_VAR => '//action/*[@helper]',
+    );
+
+    /**
+     * Construct
+     */
+    public function __construct()
+    {
+        $this->_initMessageTemplates();
+    }
+
+    /**
+     * Initialize messages templates with translating
+     *
+     * @return Mage_Adminhtml_Model_LayoutUpdate_Validator
+     */
+    protected function _initMessageTemplates()
+    {
+        if (!$this->_messageTemplates) {
+            $this->_messageTemplates = array(
+                self::PROTECTED_ATTR_HELPER_IN_TAG_ACTION_VAR =>
+                    Mage::helper('adminhtml')->__('Helper attributes should not be used in custom layout updates.'),
+                self::XML_INVALID => Mage::helper('adminhtml')->__('XML data is invalid.'),
+            );
+        }
+        return $this;
+    }
+
+    /**
+     * Returns true if and only if $value meets the validation requirements
+     *
+     * If $value fails validation, then this method returns false, and
+     * getMessages() will return an array of messages that explain why the
+     * validation failed.
+     *
+     * @throws Exception            Throw exception when xml object is not
+     *                              instance of Varien_Simplexml_Element
+     * @param Varien_Simplexml_Element|string $value
+     * @return bool
+     */
+    public function isValid($value)
+    {
+        if (is_string($value)) {
+            $value = trim($value);
+            try {
+                //wrap XML value in the "config" tag because config cannot
+                //contain multiple root tags
+                $value = new Varien_Simplexml_Element('<config>' . $value . '</config>');
+            } catch (Exception $e) {
+                $this->_error(self::XML_INVALID);
+                return false;
+            }
+        } elseif (!($value instanceof Varien_Simplexml_Element)) {
+            throw new Exception(
+                Mage::helper('adminhtml')->__('XML object is not instance of "Varien_Simplexml_Element".'));
+        }
+
+        $this->_setValue($value);
+
+        foreach ($this->_protectedExpressions as $key => $xpr) {
+            if ($this->_value->xpath($xpr)) {
+                $this->_error($key);
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator/NotProtected.php b/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator/NotProtected.php
new file mode 100644
index 0000000000..aa42caae76
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator/NotProtected.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+
+/**
+ * Validator for custom layout update
+ *
+ * Validator checked XML validation and protected expressions
+ *
+ * @category   Mage
+ * @package    Mage_Adminhtml
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Adminhtml_Model_LayoutUpdate_Validator_NotProtected extends Zend_Validate_Abstract
+{
+    const XML_INVALID                             = 'invalidXml';
+    const PROTECTED_ATTR_HELPER_IN_TAG_ACTION_VAR = 'protectedAttrHelperInActionVar';
+
+    /**
+     * The Varien SimpleXml object
+     *
+     * @var Varien_Simplexml_Element
+     */
+    protected $_value;
+
+    /**
+     * Protected expressions
+     *
+     * @var array
+     */
+    protected $_protectedExpressions = array(
+        self::PROTECTED_ATTR_HELPER_IN_TAG_ACTION_VAR => '//action/*[@helper]',
+    );
+
+    /**
+     * Construct
+     */
+    public function __construct()
+    {
+        $this->_initMessageTemplates();
+    }
+
+    /**
+     * Initialize messages templates with translating
+     *
+     * @return Mage_Adminhtml_Model_LayoutUpdate_Validator_NotProtected
+     */
+    protected function _initMessageTemplates()
+    {
+        if (!$this->_messageTemplates) {
+            $this->_messageTemplates = array(
+                self::PROTECTED_ATTR_HELPER_IN_TAG_ACTION_VAR =>
+                    Mage::helper('adminhtml')->__('Helper attributes should not be used in custom layout updates.'),
+                self::XML_INVALID => Mage::helper('adminhtml')->__('XML data is invalid.'),
+            );
+        }
+        return $this;
+    }
+
+    /**
+     * Check on the validity
+     *
+     * @throws Mage_Core_Exception  Throw exception when xml object is not
+     *                              instance of Varien_Simplexml_Element
+     * @param Varien_Simplexml_Element|string $value
+     * @return bool
+     */
+    public function isValid($value)
+    {
+        if (is_string($value)) {
+            $value = trim($value);
+            try {
+                //wrap XML value in the "config" tag because config cannot
+                //contain multiple root tags
+                $value = new Varien_Simplexml_Element('<config>' . $value . '</config>');
+            } catch (Exception $e) {
+                $this->_error(self::XML_INVALID);
+                return false;
+            }
+        } elseif (!($value instanceof Varien_Simplexml_Element)) {
+            throw new Exception(
+                Mage::helper('adminhtml')->__('XML object is not instance of "Varien_Simplexml_Element".'));
+        }
+
+        $this->_setValue($value);
+
+        foreach ($this->_protectedExpressions as $key => $xpr) {
+            if ($this->_value->xpath($xpr)) {
+                $this->_error($key);
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
index 79b042a8ac..067fdf39cf 100644
--- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
+++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
@@ -1307,13 +1307,14 @@ public function _prepareCustomer()
             return $this;
         }
 
-        $customer        = $this->getSession()->getCustomer();
-        $store           = $this->getSession()->getStore();
-        $billingAddress  = null;
-        $shippingAddress = null;
+        $customer           = $this->getSession()->getCustomer();
+        $store              = $this->getSession()->getStore();
+        $customerIsInStore  = $this->_customerIsInStore($store);
+        $billingAddress     = null;
+        $shippingAddress    = null;
 
         if ($customer->getId()) {
-            if (!$this->_customerIsInStore($store)) {
+            if (!$customerIsInStore) {
                 $customer->setId(null)
                     ->setStore($store)
                     ->setDefaultBilling(null)
@@ -1321,7 +1322,7 @@ public function _prepareCustomer()
                     ->setPassword($customer->generatePassword());
                 $this->_setCustomerData($customer);
             }
-            if ($this->getBillingAddress()->getSaveInAddressBook()) {
+            if ($this->getBillingAddress()->getSaveInAddressBook() || !$customerIsInStore) {
                 $billingAddress = $this->getBillingAddress()->exportCustomerAddress();
                 $customerAddressId = $this->getBillingAddress()->getCustomerAddressId();
                 if ($customerAddressId && $customer->getId()) {
@@ -1330,7 +1331,9 @@ public function _prepareCustomer()
                     $customer->addAddress($billingAddress);
                 }
             }
-            if (!$this->getQuote()->isVirtual() && $this->getShippingAddress()->getSaveInAddressBook()) {
+            if (!$this->getQuote()->isVirtual() && ($this->getShippingAddress()->getSaveInAddressBook()
+                || !$customerIsInStore)
+            ) {
                 $shippingAddress = $this->getShippingAddress()->exportCustomerAddress();
                 $customerAddressId = $this->getShippingAddress()->getCustomerAddressId();
                 if ($customerAddressId && $customer->getId()) {
diff --git a/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php b/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php
index cc71fa9fe7..9932ef593f 100644
--- a/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php
+++ b/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php
@@ -24,9 +24,20 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-
+/**
+ * Search Catalog Model
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
 class Mage_Adminhtml_Model_Search_Catalog extends Varien_Object
 {
+    /**
+     * Load search results
+     *
+     * @return Mage_Adminhtml_Model_Search_Catalog
+     */
     public function load()
     {
         $arr = array();
@@ -48,10 +59,10 @@ public function load()
             $description = strip_tags($product->getDescription());
             $arr[] = array(
                 'id'            => 'product/1/'.$product->getId(),
-                'type'          => 'Product',
+                'type'          => Mage::helper('adminhtml')->__('Product'),
                 'name'          => $product->getName(),
                 'description'   => Mage::helper('core/string')->substr($description, 0, 30),
-                'url'           => Mage::helper('adminhtml')->getUrl('*/catalog_product/edit', array('id'=>$product->getId())),
+                'url' => Mage::helper('adminhtml')->getUrl('*/catalog_product/edit', array('id'=>$product->getId())),
             );
         }
 
diff --git a/app/code/core/Mage/Adminhtml/Model/Search/Customer.php b/app/code/core/Mage/Adminhtml/Model/Search/Customer.php
index 713ae26ba1..34c8021e96 100644
--- a/app/code/core/Mage/Adminhtml/Model/Search/Customer.php
+++ b/app/code/core/Mage/Adminhtml/Model/Search/Customer.php
@@ -24,9 +24,20 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-
+/**
+ * Search Customer Model
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
 class Mage_Adminhtml_Model_Search_Customer extends Varien_Object
 {
+    /**
+     * Load search results
+     *
+     * @return Mage_Adminhtml_Model_Search_Customer
+     */
     public function load()
     {
         $arr = array();
@@ -49,10 +60,10 @@ public function load()
         foreach ($collection->getItems() as $customer) {
             $arr[] = array(
                 'id'            => 'customer/1/'.$customer->getId(),
-                'type'          => 'Customer',
+                'type'          => Mage::helper('adminhtml')->__('Customer'),
                 'name'          => $customer->getName(),
                 'description'   => $customer->getCompany(),
-                'url'           => Mage::helper('adminhtml')->getUrl('*/customer/edit', array('id'=>$customer->getId())),
+                'url' => Mage::helper('adminhtml')->getUrl('*/customer/edit', array('id'=>$customer->getId())),
             );
         }
 
diff --git a/app/code/core/Mage/Adminhtml/Model/Search/Order.php b/app/code/core/Mage/Adminhtml/Model/Search/Order.php
index 1e4ae7faa6..a07c63aaca 100644
--- a/app/code/core/Mage/Adminhtml/Model/Search/Order.php
+++ b/app/code/core/Mage/Adminhtml/Model/Search/Order.php
@@ -23,8 +23,21 @@
  * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
+
+/**
+ * Search Order Model
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
 class Mage_Adminhtml_Model_Search_Order extends Varien_Object
 {
+    /**
+     * Load search results
+     *
+     * @return Mage_Adminhtml_Model_Search_Order
+     */
     public function load()
     {
         $arr = array();
@@ -57,11 +70,11 @@ public function load()
         foreach ($collection as $order) {
             $arr[] = array(
                 'id'                => 'order/1/'.$order->getId(),
-                'type'              => 'Order',
+                'type'              => Mage::helper('adminhtml')->__('Order'),
                 'name'              => Mage::helper('adminhtml')->__('Order #%s', $order->getIncrementId()),
                 'description'       => $order->getBillingFirstname().' '.$order->getBillingLastname(),
                 'form_panel_title'  => Mage::helper('adminhtml')->__('Order #%s (%s)', $order->getIncrementId(), $order->getBillingFirstname().' '.$order->getBillingLastname()),
-                'url'               => Mage::helper('adminhtml')->getUrl('*/sales_order/view', array('order_id'=>$order->getId())),
+                'url' => Mage::helper('adminhtml')->getUrl('*/sales_order/view', array('order_id'=>$order->getId())),
             );
         }
 
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php
index 304e85b98e..0b6ecb8c25 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php
@@ -52,21 +52,16 @@ protected function _beforeSave()
             $uploadDir = $this->_getUploadDir();
 
             try {
-                //For DB file storage
-                //We are unable to change Varien_File_Uploader, so in case when DB storage allowed we will do next:
-                //We upload image to local Magento FS, then we check whether this file exists in DB
-                //If it exists, we are getting unique name from DB, and change them on FS
-                //After this we upload file to DB storage
                 $file = array();
-                $file['tmp_name'] = $_FILES['groups']['tmp_name'][$this->getGroupId()]['fields'][$this->getField()]['value'];
-                $file['name'] = $_FILES['groups']['name'][$this->getGroupId()]['fields'][$this->getField()]['value'];
-                $uploader = new Varien_File_Uploader($file);
+                $tmpName = $_FILES['groups']['tmp_name'];
+                $file['tmp_name'] = $tmpName[$this->getGroupId()]['fields'][$this->getField()]['value'];
+                $name = $_FILES['groups']['name'];
+                $file['name'] = $name[$this->getGroupId()]['fields'][$this->getField()]['value'];
+                $uploader = new Mage_Core_Model_File_Uploader($file);
                 $uploader->setAllowedExtensions($this->_getAllowedExtensions());
                 $uploader->setAllowRenameFiles(true);
                 $result = $uploader->save($uploadDir);
 
-                $result['file'] = Mage::helper('core/file_storage_database')->saveUploadedFile($result);
-
             } catch (Exception $e) {
                 Mage::throwException($e->getMessage());
                 return $this;
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php
new file mode 100644
index 0000000000..e566c48505
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Adminhtml
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+
+/**
+ * System config email field backend model
+ *
+ * @category   Mage
+ * @package    Mage_Adminhtml
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Adminhtml_Model_System_Config_Backend_Locale_Timezone extends Mage_Core_Model_Config_Data
+{
+    protected function _beforeSave()
+    {
+        if (!in_array($this->getValue(), DateTimeZone::listIdentifiers())) {
+            Mage::throwException(Mage::helper('adminhtml')->__('Invalid timezone'));
+        }
+
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/AjaxController.php b/app/code/core/Mage/Adminhtml/controllers/AjaxController.php
index 28314f8d1e..4e60e1c807 100644
--- a/app/code/core/Mage/Adminhtml/controllers/AjaxController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/AjaxController.php
@@ -37,10 +37,18 @@ class Mage_Adminhtml_AjaxController extends Mage_Adminhtml_Controller_Action
      * Ajax action for inline translation
      *
      */
-    public function translateAction ()
+    public function translateAction()
     {
         $translation = $this->getRequest()->getPost('translate');
         $area = $this->getRequest()->getPost('area');
+
+        //filtering
+        /** @var $filter Mage_Core_Model_Input_Filter_MaliciousCode */
+        $filter = Mage::getModel('core/input_filter_maliciousCode');
+        foreach ($translation as &$item) {
+            $item['custom'] = $filter->filter($item['custom']);
+        }
+
         echo Mage::helper('core/translate')->apply($translation, $area);
         exit();
     }
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php
index d5b398af4c..36f595debc 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php
@@ -55,7 +55,9 @@ protected function _initAction()
             $this->loadLayout()
                 ->_setActiveMenu('catalog/attributes')
                 ->_addBreadcrumb(Mage::helper('catalog')->__('Catalog'), Mage::helper('catalog')->__('Catalog'))
-                ->_addBreadcrumb(Mage::helper('catalog')->__('Manage Product Attributes'), Mage::helper('catalog')->__('Manage Product Attributes'))
+                ->_addBreadcrumb(
+                    Mage::helper('catalog')->__('Manage Product Attributes'),
+                    Mage::helper('catalog')->__('Manage Product Attributes'))
             ;
         }
         return $this;
@@ -82,14 +84,16 @@ public function editAction()
             $model->load($id);
 
             if (! $model->getId()) {
-                Mage::getSingleton('adminhtml/session')->addError(Mage::helper('catalog')->__('This attribute no longer exists'));
+                Mage::getSingleton('adminhtml/session')->addError(
+                    Mage::helper('catalog')->__('This attribute no longer exists'));
                 $this->_redirect('*/*/');
                 return;
             }
 
             // entity type check
             if ($model->getEntityTypeId() != $this->_entityTypeId) {
-                Mage::getSingleton('adminhtml/session')->addError(Mage::helper('catalog')->__('This attribute cannot be edited.'));
+                Mage::getSingleton('adminhtml/session')->addError(
+                    Mage::helper('catalog')->__('This attribute cannot be edited.'));
                 $this->_redirect('*/*/');
                 return;
             }
@@ -107,7 +111,8 @@ public function editAction()
 
         $this->_title($id ? $model->getName() : $this->__('New Attribute'));
 
-        $item = $id ? Mage::helper('catalog')->__('Edit Product Attribute') : Mage::helper('catalog')->__('New Product Attribute');
+        $item = $id ? Mage::helper('catalog')->__('Edit Product Attribute')
+                    : Mage::helper('catalog')->__('New Product Attribute');
 
         $this->_addBreadcrumb($item, $item);
 
@@ -129,7 +134,8 @@ public function validateAction()
             ->loadByCode($this->_entityTypeId, $attributeCode);
 
         if ($attribute->getId() && !$attributeId) {
-            Mage::getSingleton('adminhtml/session')->addError(Mage::helper('catalog')->__('Attribute with the same code already exists'));
+            Mage::getSingleton('adminhtml/session')->addError(
+                Mage::helper('catalog')->__('Attribute with the same code already exists'));
             $this->_initLayoutMessages('adminhtml/session');
             $response->setError(true);
             $response->setMessage($this->getLayout()->getMessagesBlock()->getGroupedHtml());
@@ -138,28 +144,100 @@ public function validateAction()
         $this->getResponse()->setBody($response->toJson());
     }
 
+    /**
+     * Filter post data
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function _filterPostData($data)
+    {
+        if ($data) {
+            /** @var $helperCatalog Mage_Catalog_Helper_Data */
+            $helperCatalog = Mage::helper('catalog');
+            //labels
+            foreach ($data['frontend_label'] as & $value) {
+                if ($value) {
+                    $value = $helperCatalog->stripTags($value);
+                }
+            }
+            //options
+            if (!empty($data['option']['value'])) {
+                foreach ($data['option']['value'] as &$options) {
+                    foreach ($options as &$label) {
+                        $label = $helperCatalog->stripTags($label);
+                    }
+                }
+            }
+            //default value
+            if (!empty($data['default_value'])) {
+                $data['default_value'] = $helperCatalog->stripTags($data['default_value']);
+            }
+            if (!empty($data['default_value_text'])) {
+                $data['default_value_text'] = $helperCatalog->stripTags($data['default_value_text']);
+            }
+            if (!empty($data['default_value_textarea'])) {
+                $data['default_value_textarea'] = $helperCatalog->stripTags($data['default_value_textarea']);
+            }
+        }
+        return $data;
+    }
+
     public function saveAction()
     {
-        if ($data = $this->getRequest()->getPost()) {
+        $data = $this->getRequest()->getPost();
+        if ($data) {
+            /** @var $session Mage_Admin_Model_Session */
+            $session = Mage::getSingleton('adminhtml/session');
+
             $redirectBack   = $this->getRequest()->getParam('back', false);
             /* @var $model Mage_Catalog_Model_Entity_Attribute */
             $model = Mage::getModel('catalog/resource_eav_attribute');
             /* @var $helper Mage_Catalog_Helper_Product */
             $helper = Mage::helper('catalog/product');
 
-            if ($id = $this->getRequest()->getParam('attribute_id')) {
+            $id = $this->getRequest()->getParam('attribute_id');
+
+            //validate attribute_code
+            if (isset($data['attribute_code'])) {
+                $validatorAttrCode = new Zend_Validate_Regex(array('pattern' => '/^[a-z_]{1,255}$/'));
+                if (!$validatorAttrCode->isValid($data['attribute_code'])) {
+                    $session->addError(
+                        $helper->__('Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.'));
+                    $this->_redirect('*/*/edit', array('attribute_id' => $id, '_current' => true));
+                    return;
+                }
+            }
+
+
+            //validate frontend_input
+            if (isset($data['frontend_input'])) {
+                /** @var $validatorInputType Mage_Eav_Model_Adminhtml_System_Config_Source_Inputtype_Validator */
+                $validatorInputType = Mage::getModel('eav/adminhtml_system_config_source_inputtype_validator');
+                if (!$validatorInputType->isValid($data['frontend_input'])) {
+                    foreach ($validatorInputType->getMessages() as $message) {
+                        $session->addError($message);
+                    }
+                    $this->_redirect('*/*/edit', array('attribute_id' => $id, '_current' => true));
+                    return;
+                }
+            }
+
+            if ($id) {
                 $model->load($id);
 
                 if (!$model->getId()) {
-                    Mage::getSingleton('adminhtml/session')->addError(Mage::helper('catalog')->__('This Attribute no longer exists'));
+                    $session->addError(
+                        Mage::helper('catalog')->__('This Attribute no longer exists'));
                     $this->_redirect('*/*/');
                     return;
                 }
 
                 // entity type check
                 if ($model->getEntityTypeId() != $this->_entityTypeId) {
-                    Mage::getSingleton('adminhtml/session')->addError(Mage::helper('catalog')->__('This attribute cannot be updated.'));
-                    Mage::getSingleton('adminhtml/session')->setAttributeData($data);
+                    $session->addError(
+                        Mage::helper('catalog')->__('This attribute cannot be updated.'));
+                    $session->setAttributeData($data);
                     $this->_redirect('*/*/');
                     return;
                 }
@@ -198,6 +276,9 @@ public function saveAction()
                 $data['apply_to'] = array();
             }
 
+            //filter
+            $data = $this->_filterPostData($data);
+
             $model->addData($data);
 
             if (!$id) {
@@ -206,7 +287,7 @@ public function saveAction()
             }
 
 
-            if($this->getRequest()->getParam('set') && $this->getRequest()->getParam('group')) {
+            if ($this->getRequest()->getParam('set') && $this->getRequest()->getParam('group')) {
                 // For creating product attribute on product page we need specify attribute set and group
                 $model->setAttributeSetId($this->getRequest()->getParam('set'));
                 $model->setAttributeGroupId($this->getRequest()->getParam('group'));
@@ -214,13 +295,14 @@ public function saveAction()
 
             try {
                 $model->save();
-                Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('catalog')->__('The product attribute has been saved.'));
+                $session->addSuccess(
+                    Mage::helper('catalog')->__('The product attribute has been saved.'));
 
                 /**
                  * Clear translation cache because attribute labels are stored in translation
                  */
                 Mage::app()->cleanCache(array(Mage_Core_Model_Translate::CACHE_TAG));
-                Mage::getSingleton('adminhtml/session')->setAttributeData(false);
+                $session->setAttributeData(false);
                 if ($this->getRequest()->getParam('popup')) {
                     $this->_redirect('adminhtml/catalog_product/addAttribute', array(
                         'id'       => $this->getRequest()->getParam('product'),
@@ -234,9 +316,9 @@ public function saveAction()
                 }
                 return;
             } catch (Exception $e) {
-                Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
-                Mage::getSingleton('adminhtml/session')->setAttributeData($data);
-                $this->_redirect('*/*/edit', array('_current' => true));
+                $session->addError($e->getMessage());
+                $session->setAttributeData($data);
+                $this->_redirect('*/*/edit', array('attribute_id' => $id, '_current' => true));
                 return;
             }
         }
@@ -251,14 +333,16 @@ public function deleteAction()
             // entity type check
             $model->load($id);
             if ($model->getEntityTypeId() != $this->_entityTypeId) {
-                Mage::getSingleton('adminhtml/session')->addError(Mage::helper('catalog')->__('This attribute cannot be deleted.'));
+                Mage::getSingleton('adminhtml/session')->addError(
+                    Mage::helper('catalog')->__('This attribute cannot be deleted.'));
                 $this->_redirect('*/*/');
                 return;
             }
 
             try {
                 $model->delete();
-                Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('catalog')->__('The product attribute has been deleted.'));
+                Mage::getSingleton('adminhtml/session')->addSuccess(
+                    Mage::helper('catalog')->__('The product attribute has been deleted.'));
                 $this->_redirect('*/*/');
                 return;
             }
@@ -268,7 +352,8 @@ public function deleteAction()
                 return;
             }
         }
-        Mage::getSingleton('adminhtml/session')->addError(Mage::helper('catalog')->__('Unable to find an attribute to delete.'));
+        Mage::getSingleton('adminhtml/session')->addError(
+            Mage::helper('catalog')->__('Unable to find an attribute to delete.'));
         $this->_redirect('*/*/');
     }
 
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php
index c0a3cdd536..94dc953910 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php
@@ -35,23 +35,17 @@ class Mage_Adminhtml_Catalog_Product_GalleryController extends Mage_Adminhtml_Co
 {
     public function uploadAction()
     {
-        //We are unable to change Varien_File_Uploader, so in case when DB storage allowed we will do next:
-        //We upload image to local Magento FS, then we check whether this file exists in DB
-        //If it exists, we are getting unique name from DB, and change them on FS
-        //After this we upload file to DB storage
-        $result = array();
         try {
-            $uploader = new Varien_File_Uploader('image');
+            $uploader = new Mage_Core_Model_File_Uploader('image');
             $uploader->setAllowedExtensions(array('jpg','jpeg','gif','png'));
-            $uploader->addValidateCallback('catalog_product_image', Mage::helper('catalog/image'), 'validateUploadFile');
+            $uploader->addValidateCallback('catalog_product_image',
+                Mage::helper('catalog/image'), 'validateUploadFile');
             $uploader->setAllowRenameFiles(true);
             $uploader->setFilesDispersion(true);
             $result = $uploader->save(
                 Mage::getSingleton('catalog/product_media_config')->getBaseTmpMediaPath()
             );
 
-            $result['file'] = Mage::helper('core/file_storage_database')->saveUploadedFile($result);
-
             $result['url'] = Mage::getSingleton('catalog/product_media_config')->getTmpMediaUrl($result['file']);
             $result['file'] = $result['file'] . '.tmp';
             $result['cookie'] = array(
@@ -63,7 +57,9 @@ public function uploadAction()
             );
 
         } catch (Exception $e) {
-            $result = array('error'=>$e->getMessage(), 'errorcode'=>$e->getCode());
+            $result = array(
+                'error' => $e->getMessage(),
+                'errorcode' => $e->getCode());
         }
 
         $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php
index 20726a6210..970620540b 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php
@@ -46,7 +46,9 @@ public function indexAction()
         $this->_setActiveMenu('catalog/sets');
 
         $this->_addBreadcrumb(Mage::helper('catalog')->__('Catalog'), Mage::helper('catalog')->__('Catalog'));
-        $this->_addBreadcrumb(Mage::helper('catalog')->__('Manage Attribute Sets'), Mage::helper('catalog')->__('Manage Attribute Sets'));
+        $this->_addBreadcrumb(
+            Mage::helper('catalog')->__('Manage Attribute Sets'),
+            Mage::helper('catalog')->__('Manage Attribute Sets'));
 
         $this->_addContent($this->getLayout()->createBlock('adminhtml/catalog_product_attribute_set_toolbar_main'));
         $this->_addContent($this->getLayout()->createBlock('adminhtml/catalog_product_attribute_set_grid'));
@@ -78,7 +80,9 @@ public function editAction()
         $this->getLayout()->getBlock('head')->setCanLoadExtJs(true);
 
         $this->_addBreadcrumb(Mage::helper('catalog')->__('Catalog'), Mage::helper('catalog')->__('Catalog'));
-        $this->_addBreadcrumb(Mage::helper('catalog')->__('Manage Product Sets'), Mage::helper('catalog')->__('Manage Product Sets'));
+        $this->_addBreadcrumb(
+            Mage::helper('catalog')->__('Manage Product Sets'),
+            Mage::helper('catalog')->__('Manage Product Sets'));
 
         $this->_addContent($this->getLayout()->createBlock('adminhtml/catalog_product_attribute_set_main'));
 
@@ -88,7 +92,10 @@ public function editAction()
     public function setGridAction()
     {
         $this->_setTypeId();
-        $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/catalog_product_attribute_set_grid')->toHtml());
+        $this->getResponse()->setBody(
+            $this->getLayout()
+                ->createBlock('adminhtml/catalog_product_attribute_set_grid')
+                ->toHtml());
     }
 
     /**
@@ -109,9 +116,14 @@ public function saveAction()
         $model  = Mage::getModel('eav/entity_attribute_set')
             ->setEntityTypeId($entityTypeId);
 
+        /** @var $helper Mage_Adminhtml_Helper_Data */
+        $helper = Mage::helper('adminhtml');
+
         try {
             if ($isNewSet) {
-                $model->setAttributeSetName($this->getRequest()->getParam('attribute_set_name'));
+                //filter html tags
+                $name = $helper->stripTags($this->getRequest()->getParam('attribute_set_name'));
+                $model->setAttributeSetName($name);
             } else {
                 if ($attributeSetId) {
                     $model->load($attributeSetId);
@@ -120,6 +132,10 @@ public function saveAction()
                     Mage::throwException(Mage::helper('catalog')->__('This attribute set no longer exists.'));
                 }
                 $data = Mage::helper('core')->jsonDecode($this->getRequest()->getPost('data'));
+
+                //filter html tags
+                $data['attribute_set_name'] = $helper->stripTags($data['attribute_set_name']);
+
                 $model->organizeData($data);
             }
 
@@ -134,7 +150,8 @@ public function saveAction()
             $this->_getSession()->addError($e->getMessage());
             $hasError = true;
         } catch (Exception $e) {
-            $this->_getSession()->addException($e, Mage::helper('catalog')->__('An error occurred while saving the attribute set.'));
+            $this->_getSession()->addException($e,
+                Mage::helper('catalog')->__('An error occurred while saving the attribute set.'));
             $hasError = true;
         }
 
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
index 40e059896e..76bc3fed23 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
@@ -250,7 +250,9 @@ public function editAction()
         if (!Mage::app()->isSingleStoreMode() && ($switchBlock = $this->getLayout()->getBlock('store_switcher'))) {
             $switchBlock->setDefaultStoreName($this->__('Default Values'))
                 ->setWebsiteIds($product->getWebsiteIds())
-                ->setSwitchUrl($this->getUrl('*/*/*', array('_current'=>true, 'active_tab'=>null, 'tab' => null, 'store'=>null)));
+                ->setSwitchUrl(
+                    $this->getUrl('*/*/*', array('_current'=>true, 'active_tab'=>null, 'tab' => null, 'store'=>null))
+                );
         }
 
         $this->getLayout()->getBlock('head')->setCanLoadExtJs(true);
@@ -298,7 +300,8 @@ public function gridOnlyAction()
         $this->_initProduct();
         $this->loadLayout();
         $this->getResponse()->setBody(
-            $this->getLayout()->createBlock('adminhtml/catalog_product_edit_tab_' . $this->getRequest()->getParam('gridOnlyBlock'))
+            $this->getLayout()
+                ->createBlock('adminhtml/catalog_product_edit_tab_' . $this->getRequest()->getParam('gridOnlyBlock'))
                 ->toHtml()
         );
     }
@@ -456,7 +459,8 @@ public function bundlesAction()
     {
         $product = $this->_initProduct();
         $this->getResponse()->setBody(
-            $this->getLayout()->createBlock('bundle/adminhtml_catalog_product_edit_tab_bundle', 'admin.product.bundle.items')
+            $this->getLayout()
+                ->createBlock('bundle/adminhtml_catalog_product_edit_tab_bundle', 'admin.product.bundle.items')
                 ->setProductId($product->getId())
                 ->toHtml()
         );
@@ -601,7 +605,8 @@ protected function _initProductSave()
             $product->setUpSellLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['upsell']));
         }
         if (isset($links['crosssell']) && !$product->getCrosssellReadonly()) {
-            $product->setCrossSellLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['crosssell']));
+            $product->setCrossSellLinkData(Mage::helper('adminhtml/js')
+                ->decodeGridSerializedInput($links['crosssell']));
         }
         if (isset($links['grouped']) && !$product->getGroupedReadonly()) {
             $product->setGroupedLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['grouped']));
@@ -621,14 +626,19 @@ protected function _initProductSave()
         /**
          * Initialize data for configurable product
          */
-        if (($data = $this->getRequest()->getPost('configurable_products_data')) && !$product->getConfigurableReadonly()) {
+        if (($data = $this->getRequest()->getPost('configurable_products_data'))
+            && !$product->getConfigurableReadonly()) {
             $product->setConfigurableProductsData(Mage::helper('core')->jsonDecode($data));
         }
-        if (($data = $this->getRequest()->getPost('configurable_attributes_data')) && !$product->getConfigurableReadonly()) {
+        if (($data = $this->getRequest()->getPost('configurable_attributes_data'))
+            && !$product->getConfigurableReadonly()) {
             $product->setConfigurableAttributesData(Mage::helper('core')->jsonDecode($data));
         }
 
-        $product->setCanSaveConfigurableAttributes((bool)$this->getRequest()->getPost('affect_configurable_product_attributes') && !$product->getConfigurableReadonly());
+        $product->setCanSaveConfigurableAttributes(
+            (bool)$this->getRequest()->getPost('affect_configurable_product_attributes')
+            && !$product->getConfigurableReadonly()
+        );
 
         /**
          * Initialize product options
@@ -637,9 +647,15 @@ protected function _initProductSave()
             $product->setProductOptions($productData['options']);
         }
 
-        $product->setCanSaveCustomOptions((bool)$this->getRequest()->getPost('affect_product_custom_options') && !$product->getOptionsReadonly());
+        $product->setCanSaveCustomOptions(
+            (bool)$this->getRequest()->getPost('affect_product_custom_options')
+            && !$product->getOptionsReadonly()
+        );
 
-        Mage::dispatchEvent('catalog_product_prepare_save', array('product' => $product, 'request' => $this->getRequest()));
+        Mage::dispatchEvent(
+            'catalog_product_prepare_save',
+            array('product' => $product, 'request' => $this->getRequest())
+        );
 
         return $product;
     }
@@ -740,7 +756,7 @@ public function duplicateAction()
         }
     }
 
-   /**
+    /**
      * @deprecated since 1.4.0.0-alpha2
      */
     protected function _decodeInput($encoded)
@@ -769,7 +785,8 @@ public function deleteAction()
                 $this->_getSession()->addError($e->getMessage());
             }
         }
-        $this->getResponse()->setRedirect($this->getUrl('*/*/', array('store'=>$this->getRequest()->getParam('store'))));
+        $this->getResponse()
+            ->setRedirect($this->getUrl('*/*/', array('store'=>$this->getRequest()->getParam('store'))));
     }
 
     /**
@@ -816,10 +833,17 @@ public function addCustomersToAlertQueueAction()
                     ->setParamValues($this->getRequest()->getParams())
                     ->addCustomersToAlertQueue())
                 {
-                    $collection->addMessage(Mage::getModel('core/message')->success($this->__('Customers for alert %s were successfuly added to queue', Mage::getSingleton('customeralert/config')->getTitleByType($key))));
+                    $getTitleByType = Mage::getSingleton('customeralert/config')->getTitleByType($key);
+                    $collection->addMessage(Mage::getModel('core/message')->success(
+                        $this->__('Customers for alert %s were successfuly added to queue', $getTitleByType)
+                    ));
                 }
             } catch (Exception $e) {
-                $collection->addMessage(Mage::getModel('core/message')->error($this->__('An error occurred while adding customers for the %s alert. Message: %s',Mage::getSingleton('customeralert/config')->getTitleByType($key),$e->getMessage())));
+                $title = Mage::getSingleton('customeralert/config')->getTitleByType($key);
+                $error = $e->getMessage();
+                $collection->addMessage(Mage::getModel('core/message')->error(
+                    $this->__('An error occurred while adding customers for the %s alert. Message: %s', $title, $error)
+                ));
                 continue;
             }
         }
@@ -829,7 +853,9 @@ public function addCustomersToAlertQueueAction()
 
     public function addAttributeAction()
     {
-        $this->_getSession()->addNotice(Mage::helper('catalog')->__('Please click on the Close Window button if it is not closed automatically.'));
+        $this->_getSession()->addNotice(
+            Mage::helper('catalog')->__('Please click on the Close Window button if it is not closed automatically.')
+        );
         $this->loadLayout('popup');
         $this->_initProduct();
         $this->_addContent(
@@ -840,7 +866,9 @@ public function addAttributeAction()
 
     public function createdAction()
     {
-        $this->_getSession()->addNotice(Mage::helper('catalog')->__('Please click on the Close Window button if it is not closed automatically.'));
+        $this->_getSession()->addNotice(
+            Mage::helper('catalog')->__('Please click on the Close Window button if it is not closed automatically.')
+        );
         $this->loadLayout('popup');
         $this->_addContent(
             $this->getLayout()->createBlock('adminhtml/catalog_product_created')
@@ -853,19 +881,20 @@ public function massDeleteAction()
         $productIds = $this->getRequest()->getParam('product');
         if (!is_array($productIds)) {
             $this->_getSession()->addError($this->__('Please select product(s).'));
-        }
-        else {
-            try {
-                foreach ($productIds as $productId) {
-                    $product = Mage::getSingleton('catalog/product')->load($productId);
-                    Mage::dispatchEvent('catalog_controller_product_delete', array('product' => $product));
-                    $product->delete();
+        } else {
+            if (!empty($productIds)) {
+                try {
+                    foreach ($productIds as $productId) {
+                        $product = Mage::getSingleton('catalog/product')->load($productId);
+                        Mage::dispatchEvent('catalog_controller_product_delete', array('product' => $product));
+                        $product->delete();
+                    }
+                    $this->_getSession()->addSuccess(
+                        $this->__('Total of %d record(s) have been deleted.', count($productIds))
+                    );
+                } catch (Exception $e) {
+                    $this->_getSession()->addError($e->getMessage());
                 }
-                $this->_getSession()->addSuccess(
-                    $this->__('Total of %d record(s) have been deleted.', count($productIds))
-                );
-            } catch (Exception $e) {
-                $this->_getSession()->addError($e->getMessage());
             }
         }
         $this->_redirect('*/*/index');
@@ -897,7 +926,8 @@ public function massStatusAction()
             $this->_getSession()->addError($e->getMessage());
         }
         catch (Exception $e) {
-            $this->_getSession()->addException($e, $this->__('An error occurred while updating the product(s) status.'));
+            $this->_getSession()
+                ->addException($e, $this->__('An error occurred while updating the product(s) status.'));
         }
 
         $this->_redirect('*/*/', array('store'=> $storeId));
@@ -915,7 +945,9 @@ public function _validateMassStatus(array $productIds, $status)
     {
         if ($status == Mage_Catalog_Model_Product_Status::STATUS_ENABLED) {
             if (!Mage::getModel('catalog/product')->isProductsHasSku($productIds)) {
-                throw new Mage_Core_Exception($this->__('Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.'));
+                throw new Mage_Core_Exception(
+                    $this->__('Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.')
+                );
             }
         }
     }
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php
index 2481a262b9..14b4536019 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php
@@ -90,7 +90,8 @@ public function editAction()
         if ($id) {
             $model->load($id);
             if (! $model->getId()) {
-                Mage::getSingleton('adminhtml/session')->addError(Mage::helper('cms')->__('This page no longer exists.'));
+                Mage::getSingleton('adminhtml/session')->addError(
+                    Mage::helper('cms')->__('This page no longer exists.'));
                 $this->_redirect('*/*/');
                 return;
             }
@@ -109,7 +110,11 @@ public function editAction()
 
         // 5. Build edit form
         $this->_initAction()
-            ->_addBreadcrumb($id ? Mage::helper('cms')->__('Edit Page') : Mage::helper('cms')->__('New Page'), $id ? Mage::helper('cms')->__('Edit Page') : Mage::helper('cms')->__('New Page'));
+            ->_addBreadcrumb(
+                $id ? Mage::helper('cms')->__('Edit Page')
+                    : Mage::helper('cms')->__('New Page'),
+                $id ? Mage::helper('cms')->__('Edit Page')
+                    : Mage::helper('cms')->__('New Page'));
 
         $this->renderLayout();
     }
@@ -133,13 +138,20 @@ public function saveAction()
 
             Mage::dispatchEvent('cms_page_prepare_save', array('page' => $model, 'request' => $this->getRequest()));
 
+            //validating
+            if (!$this->_validatePostData($data)) {
+                $this->_redirect('*/*/edit', array('page_id' => $model->getId(), '_current' => true));
+                return;
+            }
+
             // try to save it
             try {
                 // save the data
                 $model->save();
 
                 // display success message
-                Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('cms')->__('The page has been saved.'));
+                Mage::getSingleton('adminhtml/session')->addSuccess(
+                    Mage::helper('cms')->__('The page has been saved.'));
                 // clear previously saved data from session
                 Mage::getSingleton('adminhtml/session')->setFormData(false);
                 // check if 'Save and Continue'
@@ -155,7 +167,8 @@ public function saveAction()
                 $this->_getSession()->addError($e->getMessage());
             }
             catch (Exception $e) {
-                $this->_getSession()->addException($e, Mage::helper('cms')->__('An error occurred while saving the page.'));
+                $this->_getSession()->addException($e,
+                    Mage::helper('cms')->__('An error occurred while saving the page.'));
             }
 
             $this->_getSession()->setFormData($data);
@@ -180,7 +193,8 @@ public function deleteAction()
                 $title = $model->getTitle();
                 $model->delete();
                 // display success message
-                Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('cms')->__('The page has been deleted.'));
+                Mage::getSingleton('adminhtml/session')->addSuccess(
+                    Mage::helper('cms')->__('The page has been deleted.'));
                 // go to grid
                 Mage::dispatchEvent('adminhtml_cmspage_on_delete', array('title' => $title, 'status' => 'success'));
                 $this->_redirect('*/*/');
@@ -233,4 +247,30 @@ protected function _filterPostData($data)
         $data = $this->_filterDates($data, array('custom_theme_from', 'custom_theme_to'));
         return $data;
     }
+
+    /**
+     * Validate post data
+     *
+     * @param array $data
+     * @return bool     Return FALSE if someone item is invalid
+     */
+    protected function _validatePostData($data)
+    {
+        $errorNo = true;
+        if (!empty($data['layout_update_xml']) || !empty($data['custom_layout_update_xml'])) {
+            /** @var $validatorCustomLayout Mage_Adminhtml_Model_LayoutUpdate_Validator */
+            $validatorCustomLayout = Mage::getModel('adminhtml/layoutUpdate_validator');
+            if (!empty($data['layout_update_xml']) && !$validatorCustomLayout->isValid($data['layout_update_xml'])) {
+                $errorNo = false;
+            }
+            if (!empty($data['custom_layout_update_xml'])
+            && !$validatorCustomLayout->isValid($data['custom_layout_update_xml'])) {
+                $errorNo = false;
+            }
+            foreach ($validatorCustomLayout->getMessages() as $message) {
+                $this->_getSession()->addError($message);
+            }
+        }
+        return $errorNo;
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php
index 989c6b5293..2f720d828c 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php
@@ -111,15 +111,30 @@ public function deleteFolderAction()
         }
     }
 
+    /**
+     * Delete file from media storage
+     *
+     * @return void
+     */
     public function deleteFilesAction()
     {
-        $files = Mage::helper('core')->jsonDecode($this->getRequest()->getParam('files'));
         try {
+            if (!$this->getRequest()->isPost()) {
+                throw new Exception ('Wrong request.');
+            }
+            $files = Mage::helper('core')->jsonDecode($this->getRequest()->getParam('files'));
+
+            /** @var $helper Mage_Cms_Helper_Wysiwyg_Images */
             $helper = Mage::helper('cms/wysiwyg_images');
             $path = $this->getStorage()->getSession()->getCurrentPath();
             foreach ($files as $file) {
                 $file = $helper->idDecode($file);
-                $this->getStorage()->deleteFile($path . DS . $file);
+                $_filePath = realpath($path . DS . $file);
+                if (strpos($_filePath, realpath($path)) === 0 &&
+                    strpos($_filePath, realpath($helper->getStorageRoot())) === 0
+                ) {
+                    $this->getStorage()->deleteFile($path . DS . $file);
+                }
             }
         } catch (Exception $e) {
             $result = array('error' => true, 'message' => $e->getMessage());
@@ -155,7 +170,7 @@ public function onInsertAction()
         $filename = $this->getRequest()->getParam('filename');
         $filename = $helper->idDecode($filename);
         $asIs = $this->getRequest()->getParam('as_is');
-        
+
         Mage::helper('catalog')->setStoreId($storeId);
         $helper->setStoreId($storeId);
 
@@ -183,7 +198,7 @@ public function thumbnailAction()
     /**
      * Register storage model and return it
      *
-     * @return Mage_Cms_Model_Page_Wysiwyg_Images_Storage
+     * @return Mage_Cms_Model_Wysiwyg_Images_Storage
      */
     public function getStorage()
     {
@@ -206,4 +221,14 @@ protected function _saveSessionCurrentPath()
             ->setCurrentPath(Mage::helper('cms/wysiwyg_images')->getCurrentPath());
         return $this;
     }
+
+    /**
+     * Check current user permission on resource and privilege
+     *
+     * @return bool
+     */
+    protected function _isAllowed()
+    {
+        return Mage::getSingleton('admin/session')->isAllowed('cms/media_gallery');
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php
index 214d874b7e..a02dafe252 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php
@@ -31,7 +31,6 @@
  * @package    Mage_Adminhtml
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-
 class Mage_Adminhtml_Customer_Cart_Product_Composite_CartController extends Mage_Adminhtml_Controller_Action
 {
     /**
@@ -55,7 +54,7 @@ class Mage_Adminhtml_Customer_Cart_Product_Composite_CartController extends Mage
      */
     protected $_quoteItem = null;
 
-    /*
+    /**
      * Loads customer, quote and quote item by request params
      *
      * @return Mage_Adminhtml_Customer_Cart_Product_Composite_CartController
@@ -85,7 +84,7 @@ protected function _initData()
         return $this;
     }
 
-    /*
+    /**
      * Ajax handler to response configuration fieldset of composite product in customer's cart
      *
      * @return Mage_Adminhtml_Customer_Cart_Product_Composite_CartController
@@ -120,7 +119,7 @@ public function configureAction()
         return $this;
     }
 
-    /*
+    /**
      * IFrame handler for submitted configuration for quote item
      *
      * @return Mage_Adminhtml_Customer_Cart_Product_Composite_CartController
@@ -148,4 +147,14 @@ public function updateAction()
 
         return $this;
     }
+
+    /**
+     * Check the permission to Manage Customers
+     *
+     * @return bool
+     */
+    protected function _isAllowed()
+    {
+        return Mage::getSingleton('admin/session')->isAllowed('customer/manage');
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php
index 9fa9abde9e..59cf540845 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php
@@ -31,7 +31,6 @@
  * @package    Mage_Adminhtml
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-
 class Mage_Adminhtml_Customer_Wishlist_Product_Composite_WishlistController extends Mage_Adminhtml_Controller_Action
 {
      /**
@@ -48,7 +47,7 @@ class Mage_Adminhtml_Customer_Wishlist_Product_Composite_WishlistController exte
      */
     protected $_wishlistItem = null;
 
-    /*
+    /**
      * Loads wishlist and wishlist item
      *
      * @return Mage_Adminhtml_Customer_Wishlist_Product_Composite_WishlistController
@@ -76,7 +75,7 @@ protected function _initData()
         return $this;
     }
 
-    /*
+    /**
      * Ajax handler to response configuration fieldset of composite product in customer's wishlist
      *
      * @return Mage_Adminhtml_Customer_Wishlist_Product_Composite_WishlistController
@@ -105,7 +104,7 @@ public function configureAction()
         return $this;
     }
 
-    /*
+    /**
      * IFrame handler for submitted configuration for wishlist item
      *
      * @return false
@@ -136,4 +135,14 @@ public function updateAction()
 
         return false;
     }
+
+    /**
+     * Check the permission to Manage Customers
+     *
+     * @return bool
+     */
+    protected function _isAllowed()
+    {
+        return Mage::getSingleton('admin/session')->isAllowed('customer/manage');
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/controllers/IndexController.php b/app/code/core/Mage/Adminhtml/controllers/IndexController.php
index 7472170b29..b2860673ae 100644
--- a/app/code/core/Mage/Adminhtml/controllers/IndexController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/IndexController.php
@@ -47,7 +47,8 @@ public function indexAction()
     {
         $session = Mage::getSingleton('admin/session');
         $url = $session->getUser()->getStartupPageUrl();
-        if ($session->isFirstPageAfterLogin()) { // retain the "first page after login" value in session (before redirect)
+        if ($session->isFirstPageAfterLogin()) {
+            // retain the "first page after login" value in session (before redirect)
             $session->setIsFirstPageAfterLogin(true);
         }
         $this->_redirect($url);
@@ -73,13 +74,19 @@ public function loginAction()
 
     public function logoutAction()
     {
+        /** @var $adminSession Mage_Admin_Model_Session */
         $adminSession = Mage::getSingleton('admin/session');
         $adminSession->unsetAll();
+        $adminSession->getCookie()->delete($adminSession->getSessionName());
         $adminSession->addSuccess(Mage::helper('adminhtml')->__('You have logged out.'));
 
         $this->_redirect('*');
     }
 
+    /**
+     * Global Search Action
+     *
+     */
     public function globalSearchAction()
     {
         $searchModules = Mage::getConfig()->getNode("adminhtml/global_search");
@@ -88,7 +95,7 @@ public function globalSearchAction()
         if ( !Mage::getSingleton('admin/session')->isAllowed('admin/global_search') ) {
             $items[] = array(
                 'id'            => 'error',
-                'type'          => 'Error',
+                'type'          => Mage::helper('adminhtml')->__('Error'),
                 'name'          => Mage::helper('adminhtml')->__('Access Denied'),
                 'description'   => Mage::helper('adminhtml')->__('You have not enough permissions to use this functionality.')
             );
@@ -97,7 +104,7 @@ public function globalSearchAction()
             if (empty($searchModules)) {
                 $items[] = array(
                     'id'            => 'error',
-                    'type'          => 'Error',
+                    'type'          => Mage::helper('adminhtml')->__('Error'),
                     'name'          => Mage::helper('adminhtml')->__('No search modules were registered'),
                     'description'   => Mage::helper('adminhtml')->__('Please make sure that all global admin search modules are installed and activated.')
                 );
@@ -118,7 +125,11 @@ public function globalSearchAction()
                         continue;
                     }
                     $searchInstance = new $className();
-                    $results = $searchInstance->setStart($start)->setLimit($limit)->setQuery($query)->load()->getResults();
+                    $results = $searchInstance->setStart($start)
+                                    ->setLimit($limit)
+                                    ->setQuery($query)
+                                    ->load()
+                                    ->getResults();
                     $items = array_merge_recursive($items, $results);
                 }
                 $totalCount = sizeof($items);
@@ -190,7 +201,7 @@ public function forgotpasswordAction()
                 foreach ($collection as $item) {
                     $user = Mage::getModel('admin/user')->load($item->getId());
                     if ($user->getId()) {
-                        $pass = substr(md5(uniqid(rand(), true)), 0, 7);
+                        $pass = Mage::helper('core')->getRandomString(7);
                         $user->setPassword($pass);
                         $user->save();
                         $user->setPlainPassword($pass);
diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php
index eb503b2166..d4ca3644dd 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php
@@ -69,7 +69,8 @@ public function editAction()
         if ($id) {
             $model->load($id);
             if (! $model->getRuleId()) {
-                Mage::getSingleton('adminhtml/session')->addError(Mage::helper('salesrule')->__('This rule no longer exists.'));
+                Mage::getSingleton('adminhtml/session')->addError(
+                    Mage::helper('salesrule')->__('This rule no longer exists.'));
                 $this->_redirect('*/*');
                 return;
             }
@@ -92,7 +93,11 @@ public function editAction()
              ->setData('action', $this->getUrl('*/*/save'));
 
         $this
-            ->_addBreadcrumb($id ? Mage::helper('salesrule')->__('Edit Rule') : Mage::helper('salesrule')->__('New Rule'), $id ? Mage::helper('salesrule')->__('Edit Rule') : Mage::helper('salesrule')->__('New Rule'))
+            ->_addBreadcrumb(
+                $id ? Mage::helper('salesrule')->__('Edit Rule')
+                    : Mage::helper('salesrule')->__('New Rule'),
+                $id ? Mage::helper('salesrule')->__('Edit Rule')
+                    : Mage::helper('salesrule')->__('New Rule'))
             ->renderLayout();
 
     }
@@ -106,9 +111,20 @@ public function saveAction()
         if ($this->getRequest()->getPost()) {
             try {
                 $model = Mage::getModel('salesrule/rule');
-                Mage::dispatchEvent('adminhtml_controller_salesrule_prepare_save', array('request' => $this->getRequest()));
+                Mage::dispatchEvent(
+                    'adminhtml_controller_salesrule_prepare_save',
+                    array('request' => $this->getRequest()));
                 $data = $this->getRequest()->getPost();
 
+                //filter HTML tags
+                /** @var $helper Mage_Adminhtml_Helper_Data */
+                $helper = Mage::helper('adminhtml');
+                $data['name'] = $helper->stripTags($data['name']);
+                $data['description'] = $helper->stripTags($data['description']);
+                foreach ($data['store_labels'] as &$label) {
+                    $label = $helper->stripTags($label);
+                }
+
                 $data = $this->_filterDates($data, array('from_date', 'to_date'));
                 $id = $this->getRequest()->getParam('rule_id');
                 if ($id) {
@@ -130,7 +146,8 @@ public function saveAction()
                     return;
                 }
 
-                if (isset($data['simple_action']) && $data['simple_action'] == 'by_percent' && isset($data['discount_amount'])) {
+                if (isset($data['simple_action']) && $data['simple_action'] == 'by_percent'
+                && isset($data['discount_amount'])) {
                     $data['discount_amount'] = min(100,$data['discount_amount']);
                 }
                 if (isset($data['rule']['conditions'])) {
@@ -156,7 +173,8 @@ public function saveAction()
             } catch (Mage_Core_Exception $e) {
                 $this->_getSession()->addError($e->getMessage());
             } catch (Exception $e) {
-                $this->_getSession()->addError(Mage::helper('catalogrule')->__('An error occurred while saving the rule data. Please review the log and try again.'));
+                $this->_getSession()->addError(
+                    Mage::helper('catalogrule')->__('An error occurred while saving the rule data. Please review the log and try again.'));
                 Mage::logException($e);
                 Mage::getSingleton('adminhtml/session')->setPageData($data);
                  $this->_redirect('*/*/edit', array('id' => $this->getRequest()->getParam('rule_id')));
@@ -173,19 +191,22 @@ public function deleteAction()
                 $model = Mage::getModel('salesrule/rule');
                 $model->load($id);
                 $model->delete();
-                Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('salesrule')->__('The rule has been deleted.'));
+                Mage::getSingleton('adminhtml/session')->addSuccess(
+                    Mage::helper('salesrule')->__('The rule has been deleted.'));
                 $this->_redirect('*/*/');
                 return;
             } catch (Mage_Core_Exception $e) {
                 $this->_getSession()->addError($e->getMessage());
             } catch (Exception $e) {
-                $this->_getSession()->addError(Mage::helper('catalogrule')->__('An error occurred while deleting the rule. Please review the log and try again.'));
+                $this->_getSession()->addError(
+                    Mage::helper('catalogrule')->__('An error occurred while deleting the rule. Please review the log and try again.'));
                 Mage::logException($e);
                 $this->_redirect('*/*/edit', array('id' => $this->getRequest()->getParam('id')));
                 return;
             }
         }
-        Mage::getSingleton('adminhtml/session')->addError(Mage::helper('salesrule')->__('Unable to find a rule to delete.'));
+        Mage::getSingleton('adminhtml/session')->addError(
+            Mage::helper('salesrule')->__('Unable to find a rule to delete.'));
         $this->_redirect('*/*/');
     }
 
diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php
index 2a0e432f86..a0c2d1c4cb 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php
@@ -42,11 +42,6 @@ class Mage_Adminhtml_Report_SalesController extends Mage_Adminhtml_Controller_Ac
 
     public function _initAction()
     {
-        $act = $this->getRequest()->getActionName();
-        if(!$act) {
-            $act = 'default';
-        }
-
         $this->loadLayout()
             ->_addBreadcrumb(Mage::helper('reports')->__('Reports'), Mage::helper('reports')->__('Reports'))
             ->_addBreadcrumb(Mage::helper('reports')->__('Sales'), Mage::helper('reports')->__('Sales'));
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php
index 1d16d14429..1861282389 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php
@@ -116,11 +116,20 @@ protected function _initSession()
     /**
      * Processing request data
      *
-     * @param string $action
+     * @return Mage_Adminhtml_Sales_Order_CreateController
+     */
+    protected function _processData()
+    {
+        return $this->_processActionData();
+    }
+
+    /**
+     * Process request data with additional logic for saving quote and creating order
      *
+     * @param string $action
      * @return Mage_Adminhtml_Sales_Order_CreateController
      */
-    protected function _processData($action = null)
+    protected function _processActionData($action = null)
     {
         /**
          * Saving order data
@@ -443,7 +452,7 @@ public function cancelAction()
     public function saveAction()
     {
         try {
-            $this->_processData('save');
+            $this->_processActionData('save');
             if ($paymentData = $this->getRequest()->getPost('payment')) {
                 $this->_getOrderCreateModel()->setPaymentData($paymentData);
                 $this->_getOrderCreateModel()->getQuote()->getPayment()->addData($paymentData);
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php
index 948e2a4191..cb77d2124a 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php
@@ -285,7 +285,11 @@ public function saveAction()
 
                 $comment = '';
                 if (!empty($data['comment_text'])) {
-                    $creditmemo->addComment($data['comment_text'], isset($data['comment_customer_notify']), isset($data['is_visible_on_front']));
+                    $creditmemo->addComment(
+                        $data['comment_text'],
+                        isset($data['comment_customer_notify']),
+                        isset($data['is_visible_on_front'])
+                    );
                     if (isset($data['comment_customer_notify'])) {
                         $comment = $data['comment_text'];
                     }
@@ -381,8 +385,11 @@ public function addCommentAction()
                 Mage::throwException($this->__('The Comment Text field cannot be empty.'));
             }
             $creditmemo = $this->_initCreditmemo();
-            $creditmemo->addComment($data['comment'], isset($data['is_customer_notified']), isset($data['is_visible_on_front']));
-            $creditmemo->_hasDataChanges = true;
+            $creditmemo->addComment(
+                $data['comment'],
+                isset($data['is_customer_notified']),
+                isset($data['is_visible_on_front'])
+            );
             $creditmemo->save();
             $creditmemo->sendUpdateEmail(!empty($data['is_customer_notified']), $data['comment']);
 
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php
index 17ac29ed41..7e386867f8 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php
@@ -242,7 +242,11 @@ public function saveAction()
                 }
 
                 if (!empty($data['comment_text'])) {
-                    $invoice->addComment($data['comment_text'], isset($data['comment_customer_notify']), isset($data['is_visible_on_front']));
+                    $invoice->addComment(
+                        $data['comment_text'],
+                        isset($data['comment_customer_notify']),
+                        isset($data['is_visible_on_front'])
+                    );
                 }
 
                 $invoice->register();
@@ -380,9 +384,12 @@ public function addCommentAction()
                 Mage::throwException($this->__('The Comment Text field cannot be empty.'));
             }
             $invoice = $this->_initInvoice();
-            $invoice->addComment($data['comment'], isset($data['is_customer_notified']), isset($data['is_visible_on_front']));
+            $invoice->addComment(
+                $data['comment'],
+                isset($data['is_customer_notified']),
+                isset($data['is_visible_on_front'])
+            );
             $invoice->sendUpdateEmail(!empty($data['is_customer_notified']), $data['comment']);
-            $invoice->_hasDataChanges = true;
             $invoice->save();
 
             $this->loadLayout();
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
index ef1b0a06c6..9dd8792dca 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
@@ -187,7 +187,11 @@ public function saveAction()
 
                 $comment = '';
                 if (!empty($data['comment_text'])) {
-                    $shipment->addComment($data['comment_text'], isset($data['comment_customer_notify']), isset($data['is_visible_on_front']));
+                    $shipment->addComment(
+                        $data['comment_text'],
+                        isset($data['comment_customer_notify']),
+                        isset($data['is_visible_on_front'])
+                    );
                     if (isset($data['comment_customer_notify'])) {
                         $comment = $data['comment_text'];
                     }
@@ -383,9 +387,12 @@ public function addCommentAction()
                 Mage::throwException($this->__('Comment text field cannot be empty.'));
             }
             $shipment = $this->_initShipment();
-            $shipment->addComment($data['comment'], isset($data['is_customer_notified']), isset($data['is_visible_on_front']));
+            $shipment->addComment(
+                $data['comment'],
+                isset($data['is_customer_notified']),
+                isset($data['is_visible_on_front'])
+            );
             $shipment->sendUpdateEmail(!empty($data['is_customer_notified']), $data['comment']);
-            $shipment->_hasDataChanges = true;
             $shipment->save();
 
             $this->loadLayout(false);
@@ -424,7 +431,8 @@ protected function _needToAddDummy($item, $qtys) {
                 if ($child->getIsVirtual()) {
                     continue;
                 }
-                if ((isset($qtys[$child->getId()]) && $qtys[$child->getId()] > 0) || (!isset($qtys[$child->getId()]) && $child->getQtyToShip())) {
+                if ((isset($qtys[$child->getId()]) && $qtys[$child->getId()] > 0)
+                        || (!isset($qtys[$child->getId()]) && $child->getQtyToShip())) {
                     return true;
                 }
             }
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php
index 4b16a6b573..89b73a15f6 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php
@@ -105,10 +105,24 @@ public function editAction()
     public function saveAction()
     {
         $data = $this->getRequest()->getPost();
-        $isNew= $this->getRequest()->getParam('is_new');
+        $isNew = $this->getRequest()->getParam('is_new');
         if ($data) {
+
+            $statusCode = $this->getRequest()->getParam('status');
+
+            //filter tags in labels/status
+            /** @var $helper Mage_Adminhtml_Helper_Data */
+            $helper = Mage::helper('adminhtml');
+            if ($isNew) {
+                $statusCode = $data['status'] = $helper->stripTags($data['status']);
+            }
+            $data['label'] = $helper->stripTags($data['label']);
+            foreach ($data['store_labels'] as &$label) {
+                $label = $helper->stripTags($label);
+            }
+
             $status = Mage::getModel('sales/order_status')
-                ->load($this->getRequest()->getParam('status'));
+                    ->load($statusCode);
             // check if status exist
             if ($isNew && $status->getStatus()) {
                 $this->_getSession()->addError(
@@ -118,8 +132,9 @@ public function saveAction()
                 $this->_redirect('*/*/new');
                 return;
             }
+
             $status->setData($data)
-                ->setStatus($this->getRequest()->getParam('status'));
+                    ->setStatus($statusCode);
             try {
                 $status->save();
                 $this->_getSession()->addSuccess(Mage::helper('sales')->__('The order status has been saved.'));
@@ -208,4 +223,14 @@ public function unassignAction()
         }
         $this->_redirect('*/*/');
     }
+
+    /**
+     * Check current user permission on resource and privilege
+     *
+     * @return bool
+     */
+    protected function _isAllowed()
+    {
+        return Mage::getSingleton('admin/session')->isAllowed('system/order_statuses');
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
index 86f16ed920..2047ead154 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
@@ -469,7 +469,10 @@ public function pdfinvoicesAction(){
                 }
             }
             if ($flag) {
-                return $this->_prepareDownloadResponse('invoice'.Mage::getSingleton('core/date')->date('Y-m-d_H-i-s').'.pdf', $pdf->render(), 'application/pdf');
+                return $this->_prepareDownloadResponse(
+                    'invoice'.Mage::getSingleton('core/date')->date('Y-m-d_H-i-s').'.pdf', $pdf->render(),
+                    'application/pdf'
+                );
             } else {
                 $this->_getSession()->addError($this->__('There are no printable documents related to selected orders.'));
                 $this->_redirect('*/*/');
@@ -500,7 +503,10 @@ public function pdfshipmentsAction(){
                 }
             }
             if ($flag) {
-                return $this->_prepareDownloadResponse('packingslip'.Mage::getSingleton('core/date')->date('Y-m-d_H-i-s').'.pdf', $pdf->render(), 'application/pdf');
+                return $this->_prepareDownloadResponse(
+                    'packingslip'.Mage::getSingleton('core/date')->date('Y-m-d_H-i-s').'.pdf', $pdf->render(),
+                    'application/pdf'
+                );
             } else {
                 $this->_getSession()->addError($this->__('There are no printable documents related to selected orders.'));
                 $this->_redirect('*/*/');
@@ -531,7 +537,10 @@ public function pdfcreditmemosAction(){
                 }
             }
             if ($flag) {
-                return $this->_prepareDownloadResponse('creditmemo'.Mage::getSingleton('core/date')->date('Y-m-d_H-i-s').'.pdf', $pdf->render(), 'application/pdf');
+                return $this->_prepareDownloadResponse(
+                    'creditmemo'.Mage::getSingleton('core/date')->date('Y-m-d_H-i-s').'.pdf', $pdf->render(),
+                    'application/pdf'
+                );
             } else {
                 $this->_getSession()->addError($this->__('There are no printable documents related to selected orders.'));
                 $this->_redirect('*/*/');
@@ -588,7 +597,10 @@ public function pdfdocsAction(){
                 }
             }
             if ($flag) {
-                return $this->_prepareDownloadResponse('docs'.Mage::getSingleton('core/date')->date('Y-m-d_H-i-s').'.pdf', $pdf->render(), 'application/pdf');
+                return $this->_prepareDownloadResponse(
+                    'docs'.Mage::getSingleton('core/date')->date('Y-m-d_H-i-s').'.pdf',
+                    $pdf->render(), 'application/pdf'
+                );
             } else {
                 $this->_getSession()->addError($this->__('There are no printable documents related to selected orders.'));
                 $this->_redirect('*/*/');
@@ -693,13 +705,15 @@ public function transactionsAction()
     }
 
     /**
-     * Edit order adress form
+     * Edit order address form
      */
     public function addressAction()
     {
         $addressId = $this->getRequest()->getParam('address_id');
-        $address = Mage::getModel('sales/order_address')->load($addressId);
-        if ($address->getId()) {
+        $address = Mage::getModel('sales/order_address')
+            ->getCollection()
+            ->getItemById($addressId);
+        if ($address) {
             Mage::register('order_address', $address);
             $this->loadLayout();
             $this->renderLayout();
diff --git a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php
index a05df895de..03691035e7 100644
--- a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php
@@ -43,8 +43,12 @@ protected function _initAction()
         // load layout, set active menu and breadcrumbs
         $this->loadLayout()
             ->_setActiveMenu('catalog/system_sitemap')
-            ->_addBreadcrumb(Mage::helper('catalog')->__('Catalog'), Mage::helper('catalog')->__('Catalog'))
-            ->_addBreadcrumb(Mage::helper('sitemap')->__('Google Sitemap'), Mage::helper('sitemap')->__('Google Sitemap'))
+            ->_addBreadcrumb(
+                Mage::helper('catalog')->__('Catalog'),
+                Mage::helper('catalog')->__('Catalog'))
+            ->_addBreadcrumb(
+                Mage::helper('sitemap')->__('Google Sitemap'),
+                Mage::helper('sitemap')->__('Google Sitemap'))
         ;
         return $this;
     }
@@ -85,7 +89,8 @@ public function editAction()
         if ($id) {
             $model->load($id);
             if (! $model->getId()) {
-                Mage::getSingleton('adminhtml/session')->addError(Mage::helper('sitemap')->__('This sitemap no longer exists.'));
+                Mage::getSingleton('adminhtml/session')->addError(
+                    Mage::helper('sitemap')->__('This sitemap no longer exists.'));
                 $this->_redirect('*/*/');
                 return;
             }
@@ -104,7 +109,9 @@ public function editAction()
 
         // 5. Build edit form
         $this->_initAction()
-            ->_addBreadcrumb($id ? Mage::helper('sitemap')->__('Edit Sitemap') : Mage::helper('sitemap')->__('New Sitemap'), $id ? Mage::helper('sitemap')->__('Edit Sitemap') : Mage::helper('sitemap')->__('New Sitemap'))
+            ->_addBreadcrumb(
+                $id ? Mage::helper('sitemap')->__('Edit Sitemap') : Mage::helper('sitemap')->__('New Sitemap'),
+                $id ? Mage::helper('sitemap')->__('Edit Sitemap') : Mage::helper('sitemap')->__('New Sitemap'))
             ->_addContent($this->getLayout()->createBlock('adminhtml/sitemap_edit'))
             ->renderLayout();
     }
@@ -119,6 +126,28 @@ public function saveAction()
             // init model and set data
             $model = Mage::getModel('sitemap/sitemap');
 
+            //validate path to generate
+            if (!empty($data['sitemap_filename']) && !empty($data['sitemap_path'])) {
+                $path = rtrim($data['sitemap_path'], '\\/')
+                      . DS . $data['sitemap_filename'];
+                /** @var $validator Mage_Core_Model_File_Validator_AvailablePath */
+                $validator = Mage::getModel('core/file_validator_availablePath');
+                /** @var $helper Mage_Adminhtml_Helper_Catalog */
+                $helper = Mage::helper('adminhtml/catalog');
+                $validator->setPaths($helper->getSitemapValidPaths());
+                if (!$validator->isValid($path)) {
+                    foreach ($validator->getMessages() as $message) {
+                        Mage::getSingleton('adminhtml/session')->addError($message);
+                    }
+                    // save data in session
+                    Mage::getSingleton('adminhtml/session')->setFormData($data);
+                    // redirect to edit form
+                    $this->_redirect('*/*/edit', array(
+                        'sitemap_id' => $this->getRequest()->getParam('sitemap_id')));
+                    return;
+                }
+            }
+
             if ($this->getRequest()->getParam('sitemap_id')) {
                 $model ->load($this->getRequest()->getParam('sitemap_id'));
 
@@ -127,7 +156,6 @@ public function saveAction()
                 }
             }
 
-
             $model->setData($data);
 
             // try to save it
@@ -135,7 +163,8 @@ public function saveAction()
                 // save the data
                 $model->save();
                 // display success message
-                Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('sitemap')->__('The sitemap has been saved.'));
+                Mage::getSingleton('adminhtml/session')->addSuccess(
+                    Mage::helper('sitemap')->__('The sitemap has been saved.'));
                 // clear previously saved data from session
                 Mage::getSingleton('adminhtml/session')->setFormData(false);
 
@@ -159,7 +188,8 @@ public function saveAction()
                 // save data in session
                 Mage::getSingleton('adminhtml/session')->setFormData($data);
                 // redirect to edit form
-                $this->_redirect('*/*/edit', array('sitemap_id' => $this->getRequest()->getParam('sitemap_id')));
+                $this->_redirect('*/*/edit', array(
+                    'sitemap_id' => $this->getRequest()->getParam('sitemap_id')));
                 return;
             }
         }
@@ -188,7 +218,8 @@ public function deleteAction()
                 }
                 $model->delete();
                 // display success message
-                Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('sitemap')->__('The sitemap has been deleted.'));
+                Mage::getSingleton('adminhtml/session')->addSuccess(
+                    Mage::helper('sitemap')->__('The sitemap has been deleted.'));
                 // go to grid
                 $this->_redirect('*/*/');
                 return;
@@ -202,7 +233,8 @@ public function deleteAction()
             }
         }
         // display error message
-        Mage::getSingleton('adminhtml/session')->addError(Mage::helper('sitemap')->__('Unable to find a sitemap to delete.'));
+        Mage::getSingleton('adminhtml/session')->addError(
+            Mage::helper('sitemap')->__('Unable to find a sitemap to delete.'));
         // go to grid
         $this->_redirect('*/*/');
     }
@@ -222,17 +254,19 @@ public function generateAction()
             try {
                 $sitemap->generateXml();
 
-                $this->_getSession()->addSuccess(Mage::helper('sitemap')->__('The sitemap "%s" has been generated.', $sitemap->getSitemapFilename()));
+                $this->_getSession()->addSuccess(
+                    Mage::helper('sitemap')->__('The sitemap "%s" has been generated.', $sitemap->getSitemapFilename()));
             }
             catch (Mage_Core_Exception $e) {
                 $this->_getSession()->addError($e->getMessage());
             }
             catch (Exception $e) {
-                $this->_getSession()->addException($e, Mage::helper('sitemap')->__('Unable to generate the sitemap.'));
+                $this->_getSession()->addException($e,
+                    Mage::helper('sitemap')->__('Unable to generate the sitemap.'));
             }
-        }
-        else {
-            $this->_getSession()->addError(Mage::helper('sitemap')->__('Unable to find a sitemap to generate.'));
+        } else {
+            $this->_getSession()->addError(
+                Mage::helper('sitemap')->__('Unable to find a sitemap to generate.'));
         }
 
         // go to grid
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php
index fb35e73154..eb5e8f13f4 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php
@@ -45,7 +45,8 @@ protected function _initProfile($idFieldName = 'id')
         if ($profileId) {
             $profile->load($profileId);
             if (!$profile->getId()) {
-                Mage::getSingleton('adminhtml/session')->addError('The profile you are trying to save no longer exists');
+                Mage::getSingleton('adminhtml/session')->addError(
+                    $this->__('The profile you are trying to save no longer exists'));
                 $this->_redirect('*/*');
                 return false;
             }
@@ -86,15 +87,21 @@ public function indexAction()
         /**
          * Add breadcrumb item
          */
-        $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Import/Export'), Mage::helper('adminhtml')->__('Import/Export Advanced'));
-        $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Advanced Profiles'), Mage::helper('adminhtml')->__('Advanced Profiles'));
+        $this->_addBreadcrumb(
+            Mage::helper('adminhtml')->__('Import/Export'),
+            Mage::helper('adminhtml')->__('Import/Export Advanced'));
+        $this->_addBreadcrumb(
+            Mage::helper('adminhtml')->__('Advanced Profiles'),
+            Mage::helper('adminhtml')->__('Advanced Profiles'));
 
         $this->renderLayout();
     }
 
     public function gridAction()
     {
-        $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/system_convert_profile_grid')->toHtml());
+        $this->getResponse()->setBody(
+            $this->getLayout()->createBlock('adminhtml/system_convert_profile_grid')->toHtml()
+        );
     }
 
     /**
@@ -148,7 +155,8 @@ public function deleteAction()
         if ($profile->getId()) {
             try {
                 $profile->delete();
-                Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('adminhtml')->__('The profile has been deleted.'));
+                Mage::getSingleton('adminhtml/session')->addSuccess(
+                    Mage::helper('adminhtml')->__('The profile has been deleted.'));
             }
             catch (Exception $e){
                 Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
@@ -176,7 +184,8 @@ public function saveAction()
             try {
                 $profile->save();
 
-                Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('adminhtml')->__('The profile has been saved.'));
+                Mage::getSingleton('adminhtml/session')->addSuccess(
+                    Mage::helper('adminhtml')->__('The profile has been saved.'));
             }
             catch (Exception $e){
                 Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
@@ -191,7 +200,9 @@ public function saveAction()
             }
         }
         else {
-            Mage::getSingleton('adminhtml/session')->addError($this->__('Invalid POST data (please check post_max_size and upload_max_filesize settings in your php.ini file).'));
+            Mage::getSingleton('adminhtml/session')->addError(
+                $this->__('Invalid POST data (please check post_max_size and upload_max_filesize settings in your php.ini file).')
+            );
             $this->_redirect('*/*');
         }
     }
@@ -209,8 +220,8 @@ public function batchRunAction()
             $batchId = $this->getRequest()->getPost('batch_id',0);
             $rowIds  = $this->getRequest()->getPost('rows');
 
-            $batchModel = Mage::getModel('dataflow/batch')->load($batchId);
             /* @var $batchModel Mage_Dataflow_Model_Batch */
+            $batchModel = Mage::getModel('dataflow/batch')->load($batchId);
 
             if (!$batchModel->getId()) {
                 //exit
@@ -289,7 +300,9 @@ public function batchFinishAction()
      */
     public function historyAction() {
         $this->_initProfile();
-        $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/system_convert_profile_edit_tab_history')->toHtml());
+        $this->getResponse()->setBody(
+            $this->getLayout()->createBlock('adminhtml/system_convert_profile_edit_tab_history')->toHtml()
+        );
     }
 
     protected function _isAllowed()
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php
index 226e44f8d2..cc8965b9b5 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php
@@ -40,6 +40,12 @@ class Mage_Adminhtml_Tax_ClassController extends Mage_Adminhtml_Controller_Actio
     public function saveAction()
     {
         if ($postData = $this->getRequest()->getPost()) {
+
+            //filtering
+            /** @var $helper Mage_Adminhtml_Helper_Data */
+            $helper = Mage::helper('adminhtml');
+            $postData['class_name'] = $helper->stripTags($postData['class_name']);
+
             $model = Mage::getModel('tax/class')
                 ->setData($postData);
 
@@ -53,13 +59,11 @@ public function saveAction()
                 $this->_redirect($classUrl);
 
                 return ;
-            }
-            catch (Mage_Core_Exception $e) {
+            } catch (Mage_Core_Exception $e) {
                 Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
                 Mage::getSingleton('adminhtml/session')->setClassData($postData);
                 $this->_redirectReferer();
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 Mage::getSingleton('adminhtml/session')->addError(Mage::helper('tax')->__('An error occurred while saving this tax class.'));
                 Mage::getSingleton('adminhtml/session')->setClassData($postData);
                 $this->_redirectReferer();
@@ -87,4 +91,15 @@ protected function _initAction()
 
         return $this;
     }
+
+    /**
+     * Check current user permission on resource and privilege
+     *
+     * @return bool
+     */
+    protected function _isAllowed()
+    {
+        return Mage::getSingleton('admin/session')->isAllowed('sales/tax/classes_product')
+            || Mage::getSingleton('admin/session')->isAllowed('sales/tax/classes_customer');
+    }
 }
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
index e983039b0f..45b5236f19 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
@@ -93,6 +93,13 @@ public function saveAction()
     {
         $ratePost = $this->getRequest()->getPost();
         if ($ratePost) {
+            //filter tags in titles
+            /** @var $helper Mage_Adminhtml_Helper_Data */
+            $helper = Mage::helper('adminhtml');
+            $ratePost['code'] = $helper->stripTags($ratePost['code']);
+            foreach ($ratePost['title'] as &$title) {
+                $title = $helper->stripTags($title);
+            }
 
             $rateId = $this->getRequest()->getParam('tax_calculation_rate_id');
             if ($rateId) {
@@ -110,13 +117,11 @@ public function saveAction()
                 Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('tax')->__('The tax rate has been saved.'));
                 $this->getResponse()->setRedirect($this->getUrl("*/*/"));
                 return true;
-            }
-            catch (Mage_Core_Exception $e) {
+            } catch (Mage_Core_Exception $e) {
                 //save entered by the user values in session, for re-rendering of form.
                 Mage::getSingleton('adminhtml/session')->setFormData($ratePost);
                 Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 //Mage::getSingleton('adminhtml/session')->addError(Mage::helper('tax')->__('An error occurred while saving this rate.'));
                 Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
             }
@@ -261,11 +266,9 @@ public function importPostAction()
                 $this->_importRates();
 
                 Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('tax')->__('The tax rate has been imported.'));
-            }
-            catch (Mage_Core_Exception $e) {
+            } catch (Mage_Core_Exception $e) {
                 Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 Mage::getSingleton('adminhtml/session')->addError(Mage::helper('tax')->__('Invalid file upload attempt'));
             }
         }
@@ -294,7 +297,7 @@ protected function _importRates()
         $stores = array();
         $unset = array();
         $storeCollection = Mage::getModel('core/store')->getCollection()->setLoadDefault(false);
-        for ($i=5; $i<count($csvData[0]); $i++) {
+        for ($i = 5; $i < count($csvData[0]); $i++) {
             $header = $csvData[0][$i];
             $found = false;
             foreach ($storeCollection as $store) {
@@ -318,6 +321,9 @@ protected function _importRates()
             }
         }
         if ($csvData[0] == $csvFields) {
+            /** @var $helper Mage_Adminhtml_Helper_Data */
+            $helper = Mage::helper('adminhtml');
+
             foreach ($csvData as $k => $v) {
                 if ($k == 0) {
                     continue;
@@ -356,11 +362,11 @@ protected function _importRates()
 
                 if (!empty($regions[$v[1]][$v[2]])) {
                     $rateData  = array(
-                        'code'=>$v[0],
+                        'code'           => $helper->stripTags($v[0]),
                         'tax_country_id' => $v[1],
-                        'tax_region_id' => ($regions[$v[1]][$v[2]] == '*') ? 0 : $regions[$v[1]][$v[2]],
-                        'tax_postcode'  => (empty($v[3]) || $v[3]=='*') ? null : $v[3],
-                        'rate'=>$v[4],
+                        'tax_region_id'  => ($regions[$v[1]][$v[2]] == '*') ? 0 : $regions[$v[1]][$v[2]],
+                        'tax_postcode'   => (empty($v[3]) || $v[3]=='*') ? null : $v[3],
+                        'rate'           => $v[4],
                     );
 
                     $rateModel = Mage::getModel('tax/calculation_rate')->loadByCode($rateData['code']);
@@ -370,14 +376,19 @@ protected function _importRates()
 
                     $titles = array();
                     foreach ($stores as $field=>$id) {
-                        $titles[$id]=$v[$field];
+                        $titles[$id] = $v[$field];
                     }
+
+                    //filter tags in titles
+                    foreach ($titles as &$title) {
+                        $title = $helper->stripTags($title);
+                    }
+
                     $rateModel->setTitle($titles);
                     $rateModel->save();
                 }
             }
-        }
-        else {
+        } else {
             Mage::throwException(Mage::helper('tax')->__('Invalid file format upload attempt'));
         }
     }
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php
index 605550b8ee..17460b25ba 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php
@@ -86,6 +86,12 @@ public function editAction()
     public function saveAction()
     {
         if ($postData = $this->getRequest()->getPost()) {
+
+            //filtering
+            /** @var $helper Mage_Adminhtml_Helper_Data */
+            $helper = Mage::helper('adminhtml');
+            $postData['code'] = $helper->stripTags($postData['code']);
+
             $ruleModel = Mage::getSingleton('tax/calculation_rule');
             $ruleModel->setData($postData);
 
diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml
index fc25bd3a8e..f7041b6409 100644
--- a/app/code/core/Mage/Adminhtml/etc/config.xml
+++ b/app/code/core/Mage/Adminhtml/etc/config.xml
@@ -177,6 +177,23 @@
                 <enable_charts>1</enable_charts>
             </dashboard>
         </system>
+        <general>
+            <file>
+                <sitemap_generate_valid_paths>
+                    <!-- This data should be merged with public_files_valid_paths -->
+                    <available>
+                        <any_path>/*/sitemap.xml</any_path>
+                    </available>
+                </sitemap_generate_valid_paths>
+            </file>
+            <validator_data>
+                <input_types>
+                    <price>price</price>
+                    <media_image>media_image</media_image>
+                    <gallery>gallery</gallery>
+                </input_types>
+            </validator_data>
+        </general>
     </default>
     <stores>
         <admin>
diff --git a/app/code/core/Mage/Api/Helper/Data.php b/app/code/core/Mage/Api/Helper/Data.php
index f9bef6047c..e14d6e17df 100644
--- a/app/code/core/Mage/Api/Helper/Data.php
+++ b/app/code/core/Mage/Api/Helper/Data.php
@@ -33,4 +33,141 @@
  */
 class Mage_Api_Helper_Data extends Mage_Core_Helper_Abstract
 {
+    const XML_PATH_API_WSI = 'api/config/compliance_wsi';
+
+    /**
+     * @return boolean
+     */
+    public function isComplianceWSI()
+    {
+        return Mage::getStoreConfig(self::XML_PATH_API_WSI);
+    }
+
+    /**
+     * Go thru a WSI args array and turns it to correct state.
+     *
+     * @param Object $obj - Link to Object
+     * @return Object
+     */
+    public function wsiArrayUnpacker(&$obj){
+        if(is_object($obj)){
+
+            $modifiedKeys = $this->clearWsiFootprints($obj);
+
+            foreach( $obj as $key => $value ){
+                if(is_object($value)){
+                    $this->wsiArrayUnpacker($value);
+                }
+                if(is_array($value)){
+                    foreach($value as &$val){
+                        if(is_object($val)){
+                            $this->wsiArrayUnpacker($val);
+                        }
+                    }
+                }
+            }
+        }
+
+        foreach($modifiedKeys as $arrKey){
+            $this->assocativArrayUnpacker($obj->$arrKey);
+        }
+    }
+
+    /**
+     * Go thru mixed and turns it to a correct look.
+     *
+     * @param Mixed $mixed A link to variable that may contain associative array.
+     */
+    public function assocativArrayUnpacker(&$mixed){
+
+            if(is_array($mixed)){
+                $tmpArr = array();
+                foreach($mixed as $key => $value){
+                    if(is_object($value)){
+                        $value = get_object_vars($value);
+                        if(count($value) == 2 && isset($value['key']) && isset($value['value'])){
+                            $tmpArr[$value['key']] = $value['value'];
+                        }
+                    }
+                }
+                if(count($tmpArr)){
+                    $mixed = $tmpArr;
+                }
+            }
+
+            if(is_object($mixed)){
+                $numOfVals = count(get_object_vars($mixed));
+                if($numOfVals == 2 && isset($mixed->key) && isset($mixed->value)){
+                    $mixed = get_object_vars($mixed);
+                    /*
+                     * Processing an associative arrays.
+                     * $mixed->key = '2'; $mixed->value = '3'; turns to array(2 => '3');
+                     */
+                    $mixed = array($mixed['key'] => $mixed['value']);
+                }
+            }
+    }
+
+    /**
+     * Corrects data representation.
+     *
+     * @param Object $obj - Link to Object
+     * @return Object
+     */
+    public function clearWsiFootprints(&$obj){
+        $modifiedKeys = array();
+
+        $objectKeys = array_keys(get_object_vars($obj));
+
+        foreach( $objectKeys as $key ){
+            if(is_object($obj->$key) && isset($obj->$key->complexObjectArray) ){
+                $obj->$key = $obj->$key->complexObjectArray;
+                $modifiedKeys[] = $key;
+            }
+        }
+        return $modifiedKeys;
+    }
+
+    /**
+     * For the WSI, generates an response object.
+     *
+     * @param Object $arr - Link to Object
+     * @return Object
+     */
+    public function wsiArrayPacker($mixed){
+        if(is_array($mixed)){
+            $arrKeys = array_keys($mixed);
+            $isDigit = false;
+            $isString = false;
+            foreach($arrKeys as $key){
+                if(is_int($key)){
+                    $isDigit = true;
+                    break;
+                }
+            }
+            if($isDigit){
+                $mixed = $this->packArrayToObjec($mixed);
+            } else {
+                $mixed = (object)$mixed;
+            }
+        }
+        if(is_object($mixed) && isset($mixed->complexObjectArray)){
+            foreach($mixed->complexObjectArray as $k => $v){
+                $mixed->complexObjectArray[$k] = $this->wsiArrayPacker($v);
+            }
+        }
+        return $mixed;
+    }
+
+    /**
+     * For response to the WSI, generates an object from array.
+     *
+     * @param Array $arr - Link to Object
+     * @return Object
+     */
+    public function packArrayToObjec(Array $arr){
+        $obj = new stdClass();
+        $obj->complexObjectArray = $arr;
+        return $obj;
+    }
 } // Class Mage_Api_Helper_Data End
diff --git a/app/code/core/Mage/Api/Model/Mysql4/User.php b/app/code/core/Mage/Api/Model/Mysql4/User.php
index 6ef9445889..2fa75d2f31 100644
--- a/app/code/core/Mage/Api/Model/Mysql4/User.php
+++ b/app/code/core/Mage/Api/Model/Mysql4/User.php
@@ -248,7 +248,9 @@ public function _getRoles(Mage_Core_Model_Abstract $user)
         $table  = $this->getTable('api/role');
         $read   = $this->_getReadAdapter();
         $select = $read->select()->from($table, array())
-                    ->joinLeft(array('ar' => $table), "(ar.role_id = `{$table}`.parent_id and ar.role_type = 'G')", array('role_id'))
+                    ->joinLeft(array('ar' => $table),
+                        "(ar.role_id = `{$table}`.parent_id and ar.role_type = 'G')",
+                        array('role_id'))
                     ->where("`{$table}`.user_id = {$user->getId()}");
 
         return (($roles = $read->fetchCol($select)) ? $roles : array());
@@ -290,7 +292,8 @@ public function deleteFromRole(Mage_Core_Model_Abstract $user) {
             return $this;
         }
         $dbh = $this->_getWriteAdapter();
-        $condition = "`{$this->getTable('api/role')}`.user_id = ".$dbh->quote($user->getUserId())." AND `{$this->getTable('api/role')}`.parent_id = ".$dbh->quote($user->getRoleId());
+        $condition = "`{$this->getTable('api/role')}`.user_id = " . $dbh->quote($user->getUserId()) .
+            " AND `{$this->getTable('api/role')}`.parent_id = " . $dbh->quote($user->getRoleId());
         $dbh->delete($this->getTable('api/role'), $condition);
         return $this;
     }
@@ -311,9 +314,17 @@ public function roleUserExists(Mage_Core_Model_Abstract $user)
     public function userExists(Mage_Core_Model_Abstract $user)
     {
         $usersTable = $this->getTable('api/user');
-        $select = $this->_getReadAdapter()->select();
-        $select->from($usersTable);
-        $select->where("({$usersTable}.username = '{$user->getUsername()}' OR {$usersTable}.email = '{$user->getEmail()}') AND {$usersTable}.user_id != '{$user->getId()}'");
-        return $this->_getReadAdapter()->fetchRow($select);
+        $db = $this->_getReadAdapter();
+
+        $select = $db->select()
+            ->from(array('u' => $usersTable))
+            ->where('u.user_id != ?', (int) $user->getId())
+            ->where('u.username = :username OR u.email = :email')
+        ;
+        $row = $db->fetchRow($select, array(
+            ':username' => $user->getUsername(),
+            ':email'    => $user->getUsername(),
+        ));
+        return $row;
     }
 }
diff --git a/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php
new file mode 100644
index 0000000000..e4b2116f26
--- /dev/null
+++ b/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Api
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Webservice soap adapter
+ *
+ * @category   Mage
+ * @package    Mage_Api
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Api_Model_Server_WSI_Adapter_Soap extends Mage_Api_Model_Server_Adapter_Soap
+{
+    /**
+     * Run webservice
+     *
+     * @param Mage_Api_Controller_Action $controller
+     * @return Mage_Api_Model_Server_Adapter_Soap
+     */
+    public function run()
+    {
+        $apiConfigCharset = Mage::getStoreConfig("api/config/charset");
+
+        if ($this->getController()->getRequest()->getParam('wsdl') !== null) {
+            $wsdlConfig = Mage::getModel('api/wsdl_config');
+            $wsdlConfig->setHandler($this->getHandler())
+                ->init();
+            $this->getController()->getResponse()
+                ->clearHeaders()
+                ->setHeader('Content-Type','text/xml; charset='.$apiConfigCharset)
+                ->setBody(
+                        preg_replace(
+                            '/(\>\<)/i',
+                            ">\n<",
+                            str_replace(
+                                    '<soap:operation soapAction=""></soap:operation>',
+                                    "<soap:operation soapAction=\"\" />\n",
+                                    str_replace(
+                                            '<soap:body use="literal"></soap:body>',
+                                            "<soap:body use=\"literal\" />\n",
+                                            preg_replace(
+                                                '/<\?xml version="([^\"]+)"([^\>]+)>/i',
+                                                '<?xml version="$1" encoding="'.$apiConfigCharset.'"?>',
+                                                $wsdlConfig->getWsdlContent()
+                                            )
+                                    )
+                            )
+                        )
+                );
+        } else {
+            try {
+                $this->_instantiateServer();
+
+                $this->getController()->getResponse()
+                    ->clearHeaders()
+                    ->setHeader('Content-Type','text/xml; charset='.$apiConfigCharset)
+                    ->setBody(
+                        preg_replace(
+                            '/(\>\<)/i',
+                            ">\n<",
+                            str_replace(
+                                    '<soap:operation soapAction=""></soap:operation>',
+                                    "<soap:operation soapAction=\"\" />\n",
+                                    str_replace(
+                                            '<soap:body use="literal"></soap:body>',
+                                            "<soap:body use=\"literal\" />\n",
+                                            preg_replace(
+                                                '/<\?xml version="([^\"]+)"([^\>]+)>/i',
+                                                '<?xml version="$1" encoding="'.$apiConfigCharset.'"?>',
+                                                $this->_soap->handle()
+                                            )
+                                    )
+                            )
+                        )
+                    );
+            } catch( Zend_Soap_Server_Exception $e ) {
+                $this->fault( $e->getCode(), $e->getMessage() );
+            } catch( Exception $e ) {
+                $this->fault( $e->getCode(), $e->getMessage() );
+            }
+        }
+
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php b/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php
new file mode 100644
index 0000000000..2ba34a93cf
--- /dev/null
+++ b/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Api
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Webservices server handler WSI
+ *
+ * @category   Mage
+ * @package    Mage_Api
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Api_Model_Server_WSI_Handler extends Mage_Api_Model_Server_Handler_Abstract
+{
+    protected $_resourceSuffix = '_v2';
+
+    /**
+     * Interceptor for all interfaces
+     *
+     * @param string $function
+     * @param array $args
+     */
+
+    public function __call ($function, $args)
+    {
+        $args = $args[0];
+
+        /** @var Mage_Api_Helper_Data */
+        $helper = Mage::helper('api/data');
+
+        $helper->wsiArrayUnpacker($args);
+        $args = get_object_vars($args);
+
+        if(isset($args['sessionId'])){
+            $sessionId = $args['sessionId'];
+            unset($args['sessionId']);
+        } else {
+            // Was left for backward compatibility.
+            $sessionId = array_shift( $args );
+        }
+
+        $apiKey = '';
+        $nodes = Mage::getSingleton('api/config')->getNode('v2/resources_function_prefix')->children();
+        foreach ($nodes as $resource => $prefix) {
+            $prefix = $prefix->asArray();
+            if (false !== strpos($function, $prefix)) {
+                $method = substr($function, strlen($prefix));
+                $apiKey = $resource . '.' . strtolower($method[0]).substr($method, 1);
+            }
+        }
+
+        list($modelName, $methodName) = $this->_getResourceName($apiKey);
+        $methodParams = $this->getMethodParams($modelName, $methodName);
+
+        $args = $this->prepareArgs($methodParams, $args);
+
+        $res = $this->call($sessionId, $apiKey, $args);
+
+        $obj = $helper->wsiArrayPacker($res);
+        $stdObj = new stdClass();
+        $stdObj->result = $obj;
+
+        return $stdObj;
+    }
+
+    /**
+     * Login user and Retrieve session id
+     *
+     * @param string $username
+     * @param string $apiKey
+     * @return string
+     */
+    public function login($username, $apiKey=null)
+    {
+
+        /** @todo implement WS-I support check */
+//
+        if (is_object($username)) {
+            $apiKey = $username->apiKey;
+            $username = $username->username;
+        }
+
+        $stdObject = new stdClass();
+        $stdObject->result = parent::login($username, $apiKey);
+        return $stdObject;
+    }
+
+    /**
+     * Return called class and method names
+     *
+     * @param String $apiPath
+     * @return Array 
+     */
+    protected function _getResourceName($apiPath){
+
+        list($resourceName, $methodName) = explode('.', $apiPath);
+
+        if (empty($resourceName) || empty($methodName)) {
+            return $this->_fault('resource_path_invalid');
+        }
+
+        $resourcesAlias = $this->_getConfig()->getResourcesAlias();
+        $resources      = $this->_getConfig()->getResources();
+        if (isset($resourcesAlias->$resourceName)) {
+            $resourceName = (string) $resourcesAlias->$resourceName;
+        }
+
+        $methodInfo = $resources->$resourceName->methods->$methodName;
+
+        $modelName = $this->_prepareResourceModelName((string) $resources->$resourceName->model);
+
+        $modelClass = Mage::getConfig()->getModelClassName($modelName);
+
+        $method = (isset($methodInfo->method) ? (string) $methodInfo->method : $methodName);
+
+        return array($modelClass, $method);
+    }
+
+    /**
+     * Return an array of parameters for the callable method.
+     * 
+     * @param String $modelName
+     * @param String $methodName
+     * @return Array of ReflectionParameter
+     */
+    public function getMethodParams($modelName, $methodName) {
+
+        $method = new ReflectionMethod($modelName, $methodName);
+
+        return $method->getParameters();
+    }
+
+    /**
+     * Prepares arguments for the method calling. Sort in correct order, set default values for omitted parameters.
+     *
+     * @param Array $params
+     * @param Array $args
+     * @return Array
+     */
+    public function prepareArgs($params, $args) {
+
+        $callArgs = array();
+
+        /** @var $parameter ReflectionParameter */
+        foreach($params AS $parameter){
+            $pName = $parameter->getName();
+            if( isset( $args[$pName] ) ){
+                $callArgs[$pName] = $args[$pName];
+            } else {
+                if($parameter->isOptional()){
+                    $callArgs[$pName] = $parameter->getDefaultValue();
+                } else {
+                    Mage::logException(new Exception("Required parameter \"$pName\" is missing.", 0, null));
+                    $this->_fault('invalid_request_param');
+                }
+            }
+        }
+        return $callArgs;
+    }
+
+}
diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config.php b/app/code/core/Mage/Api/Model/Wsdl/Config.php
index cc3b3c7846..7d851573ea 100644
--- a/app/code/core/Mage/Api/Model/Wsdl/Config.php
+++ b/app/code/core/Mage/Api/Model/Wsdl/Config.php
@@ -103,15 +103,27 @@ public function init()
         $mergeWsdl = new Mage_Api_Model_Wsdl_Config_Base();
         $mergeWsdl->setHandler($this->getHandler());
 
+        if(Mage::helper('api/data')->isComplianceWSI()){
         /**
          * Exclude Mage_Api wsdl xml file because it used for previous version
          * of API wsdl declaration
          */
-        $mergeWsdl->addLoadedFile(Mage::getConfig()->getModuleDir('etc', "Mage_Api").DS.'wsdl.xml');
-
-        $baseWsdlFile = Mage::getConfig()->getModuleDir('etc', "Mage_Api").DS.'wsdl2.xml';
-        $this->loadFile($baseWsdlFile);
-        Mage::getConfig()->loadModulesConfiguration('wsdl.xml', $this, $mergeWsdl);
+            $mergeWsdl->addLoadedFile(Mage::getConfig()->getModuleDir('etc', "Mage_Api").DS.'wsi.xml');
+
+            $baseWsdlFile = Mage::getConfig()->getModuleDir('etc', "Mage_Api").DS.'wsi.xml';
+            $this->loadFile($baseWsdlFile);
+            Mage::getConfig()->loadModulesConfiguration('wsi.xml', $this, $mergeWsdl);
+        } else {
+            /**
+             * Exclude Mage_Api wsdl xml file because it used for previous version
+             * of API wsdl declaration
+             */
+            $mergeWsdl->addLoadedFile(Mage::getConfig()->getModuleDir('etc', "Mage_Api").DS.'wsdl.xml');
+
+            $baseWsdlFile = Mage::getConfig()->getModuleDir('etc', "Mage_Api").DS.'wsdl2.xml';
+            $this->loadFile($baseWsdlFile);
+            Mage::getConfig()->loadModulesConfiguration('wsdl.xml', $this, $mergeWsdl);
+        }
 
         if (Mage::app()->useCache('config')) {
             $this->saveCache(array('config'));
diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php
index 3643eb75fa..0cb2aba095 100644
--- a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php
+++ b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php
@@ -173,8 +173,11 @@ public function getChildren($source)
     {
         $children = array();
         $namespaces = $source->getNamespaces(true);
+
+        $isWsi = Mage::helper('api/data')->isComplianceWSI();
+
         foreach ($namespaces as $key => $value) {
-            if ($key == '' || $key == 'wsdl') {
+            if ($key == '' || (!$isWsi && $key == 'wsdl')) {
                 continue;
             }
             $children[$value] = $source->children($value);
diff --git a/app/code/core/Mage/Api/controllers/IndexController.php b/app/code/core/Mage/Api/controllers/IndexController.php
index f67be513e9..21f45a29e3 100644
--- a/app/code/core/Mage/Api/controllers/IndexController.php
+++ b/app/code/core/Mage/Api/controllers/IndexController.php
@@ -35,10 +35,8 @@ class Mage_Api_IndexController extends Mage_Api_Controller_Action
 {
     public function indexAction()
     {
-        $server = Mage::getSingleton('api/server');
-
         /* @var $server Mage_Api_Model_Server */
-        $this->_getServer()->init($this, 'soap')
+        $this->_getServer()->init($this)
             ->run();
     }
 } // Class Mage_Api_IndexController End
diff --git a/app/code/core/Mage/Api/controllers/SoapController.php b/app/code/core/Mage/Api/controllers/SoapController.php
index 75a7d0c2e2..74e43829cb 100644
--- a/app/code/core/Mage/Api/controllers/SoapController.php
+++ b/app/code/core/Mage/Api/controllers/SoapController.php
@@ -35,10 +35,8 @@ class Mage_Api_SoapController extends Mage_Api_Controller_Action
 {
     public function indexAction()
     {
-        $server = Mage::getSingleton('api/server');
-
         /* @var $server Mage_Api_Model_Server */
-        $this->_getServer()->init($this)
+        $this->_getServer()->init($this, 'soap')
             ->run();
     }
 } // Class Mage_Api_IndexController End
diff --git a/app/code/core/Mage/Api/controllers/V2/SoapController.php b/app/code/core/Mage/Api/controllers/V2/SoapController.php
index d7c99a6796..7d363270a2 100644
--- a/app/code/core/Mage/Api/controllers/V2/SoapController.php
+++ b/app/code/core/Mage/Api/controllers/V2/SoapController.php
@@ -35,10 +35,14 @@ class Mage_Api_V2_SoapController extends Mage_Api_Controller_Action
 {
     public function indexAction()
     {
-        $server = Mage::getSingleton('api/server');
+        if(Mage::helper('api/data')->isComplianceWSI()){
+            $handler_name = 'soap_wsi';
+        } else {
+            $handler_name = 'soap_v2';
+        }
 
         /* @var $server Mage_Api_Model_Server */
-        $this->_getServer()->init($this, 'soap_v2', 'soap_v2')
+        $this->_getServer()->init($this, $handler_name, $handler_name)
             ->run();
     }
 } // Class Mage_Api_IndexController End
diff --git a/app/code/core/Mage/Api/etc/adminhtml.xml b/app/code/core/Mage/Api/etc/adminhtml.xml
index ce1b3e6f14..768f8ed0d3 100644
--- a/app/code/core/Mage/Api/etc/adminhtml.xml
+++ b/app/code/core/Mage/Api/etc/adminhtml.xml
@@ -49,7 +49,7 @@
                             <config>
                                 <children>
                                     <api translate="title" module="api">
-                                        <title>Magento Core Api Section</title>
+                                        <title>Magento Core API Section</title>
                                     </api>
                                 </children>
                             </config>
diff --git a/app/code/core/Mage/Api/etc/api.xml b/app/code/core/Mage/Api/etc/api.xml
index 30d691a43f..83a6b4d321 100644
--- a/app/code/core/Mage/Api/etc/api.xml
+++ b/app/code/core/Mage/Api/etc/api.xml
@@ -48,6 +48,16 @@
                     </extensions>
                 </required>
             </soap_v2>
+            <soap_wsi>
+                <model>api/server_wsi_adapter_soap</model>
+                <handler>soap_wsi</handler>
+                <active>1</active>
+                <required>
+                    <extensions>
+                        <soap />
+                    </extensions>
+                </required>
+            </soap_wsi>
             <xmlrpc>
                 <model>api/server_adapter_xmlrpc</model>
                 <handler>default</handler>
@@ -64,6 +74,9 @@
             <soap_v2>
                 <model>api/server_v2_handler</model>
             </soap_v2>
+            <soap_wsi>
+                <model>api/server_wsi_handler</model>
+            </soap_wsi>
         </handlers>
         <resources>
         </resources>
@@ -101,6 +114,10 @@
                 <code>5</code>
                 <message>Session expired. Try to relogin.</message>
             </session_expired>
+            <invalid_request_param>
+                <code>6</code>
+                <message>Required parameter is missing, for more details see "exception.log".</message>
+            </invalid_request_param>
         </faults>
         <acl>
             <asserts>
diff --git a/app/code/core/Mage/Api/etc/config.xml b/app/code/core/Mage/Api/etc/config.xml
index c69798774a..63121dee3a 100644
--- a/app/code/core/Mage/Api/etc/config.xml
+++ b/app/code/core/Mage/Api/etc/config.xml
@@ -121,6 +121,7 @@
             <config>
                 <charset>UTF-8</charset>
                 <session_timeout>3600</session_timeout>
+                <compliance_wsi>0</compliance_wsi>
             </config>
         </api>
     </default>
diff --git a/app/code/core/Mage/Api/etc/system.xml b/app/code/core/Mage/Api/etc/system.xml
index 5008afc78c..557fa44a53 100644
--- a/app/code/core/Mage/Api/etc/system.xml
+++ b/app/code/core/Mage/Api/etc/system.xml
@@ -28,7 +28,7 @@
 <config>
    <sections>
         <api translate="label" module="api">
-            <label>Magento Core Api</label>
+            <label>Magento Core API</label>
             <tab>service</tab>
             <frontend_type>text</frontend_type>
             <sort_order>101</sort_order>
@@ -60,6 +60,16 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                         </session_timeout>
+                        <compliance_wsi translate="label">
+                            <label>WS-I Compliance</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <backend_model>adminhtml/system_config_backend_store</backend_model>
+                            <sort_order>30</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </compliance_wsi>
                     </fields>
                 </config>
             </groups>
diff --git a/app/code/core/Mage/Api/etc/wsi.xml b/app/code/core/Mage/Api/etc/wsi.xml
new file mode 100644
index 0000000000..ded00510c1
--- /dev/null
+++ b/app/code/core/Mage/Api/etc/wsi.xml
@@ -0,0 +1,370 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:typens="urn:{{var wsdl.name}}"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+             name="{{var wsdl.name}}"
+             targetNamespace="urn:{{var wsdl.name}}">
+    <wsdl:types>
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:{{var wsdl.name}}">
+            <xsd:complexType name="associativeEntity">
+                <xsd:sequence>
+                    <xsd:element name="key" type="xsd:string" />
+                    <xsd:element name="value" type="xsd:string" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="associativeArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:associativeEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="complexFilter">
+                <xsd:sequence>
+                    <xsd:element name="key" type="xsd:string" />
+                    <xsd:element name="value" type="typens:associativeEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="complexFilterArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:complexFilter" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="filters">
+                <xsd:sequence>
+                    <xsd:element name="filter" type="typens:associativeArray" minOccurs="0" />
+                    <xsd:element name="complex_filter" type="typens:complexFilterArray" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="ArrayOfString">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="xsd:string" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="ArrayOfInt">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="xsd:int" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="apiMethodEntity">
+                <xsd:sequence>
+                    <xsd:element name="title" type="xsd:string" />
+                    <xsd:element name="path" type="xsd:string" />
+                    <xsd:element name="name" type="xsd:string" />
+                    <xsd:element name="aliases" type="typens:ArrayOfString" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="ArrayOfApiMethods">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:apiMethodEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="apiEntity">
+                <xsd:sequence>
+                    <xsd:element name="title" type="xsd:string" />
+                    <xsd:element name="name" type="xsd:string" />
+                    <xsd:element name="aliases" type="typens:ArrayOfString" />
+                    <xsd:element name="methods" type="typens:ArrayOfApiMethods" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="ArrayOfApis">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:apiEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="existsFaltureEntity">
+                <xsd:sequence>
+                    <xsd:element name="code" type="xsd:string" />
+                    <xsd:element name="message" type="xsd:string" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="ArrayOfExistsFaltures">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:existsFaltureEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+
+
+
+            <xsd:element name="callParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="apiPath" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="args" type="xsd:anyType" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="callResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:anyType" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="multiCallParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="calls" type="xsd:anyType" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="options" type="xsd:anyType" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="multiCallResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:anyType" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="endSessionParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="endSessionResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="loginParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="username" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="apiKey" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="loginResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="resourcesRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="resourcesResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:ArrayOfApis" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="globalFaultsParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="globalFaultsResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:ArrayOfExistsFaltures" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="resourceFaultsParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="resourceName" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="resourceFaultsResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:ArrayOfExistsFaltures" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="startSessionResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="call">
+        <wsdl:part name="parameters" element="typens:callParam" />
+    </wsdl:message>
+    <wsdl:message name="callResponse">
+        <wsdl:part name="parameters" element="typens:callResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="multiCall">
+        <wsdl:part name="parameters" element="typens:multiCallParam" />
+    </wsdl:message>
+    <wsdl:message name="multiCallResponse">
+        <wsdl:part name="parameters" element="typens:multiCallResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="endSession">
+        <wsdl:part name="parameters" element="typens:endSessionParam" />
+    </wsdl:message>
+    <wsdl:message name="endSessionResponse">
+        <wsdl:part name="parameters" element="typens:endSessionResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="login">
+        <wsdl:part name="parameters" element="typens:loginParam" />
+    </wsdl:message>
+    <wsdl:message name="loginResponse">
+        <wsdl:part name="parameters" element="typens:loginResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="resourcesRequest">
+        <wsdl:part name="parameters" element="typens:resourcesRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="resourcesResponse">
+        <wsdl:part name="parameters" element="typens:resourcesResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="globalFaults">
+        <wsdl:part name="parameters" element="typens:globalFaultsParam" />
+    </wsdl:message>
+    <wsdl:message name="globalFaultsResponse">
+        <wsdl:part name="parameters" element="typens:globalFaultsResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="resourceFaults">
+        <wsdl:part name="parameters" element="typens:resourceFaultsParam" />
+    </wsdl:message>
+    <wsdl:message name="resourceFaultsResponse">
+        <wsdl:part name="parameters" element="typens:resourceFaultsResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="startSession" />
+    <wsdl:message name="startSessionResponse">
+        <wsdl:part name="parameters" element="typens:startSessionResponseParam" />
+    </wsdl:message>
+    <wsdl:portType name="{{var wsdl.handler}}PortType">
+        <wsdl:operation name="call">
+            <wsdl:documentation>Call api functionality</wsdl:documentation>
+            <wsdl:input message="typens:call" />
+            <wsdl:output message="typens:callResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="multiCall">
+            <wsdl:documentation>Multiple calls of resource functionality</wsdl:documentation>
+            <wsdl:input message="typens:multiCall" />
+            <wsdl:output message="typens:multiCallResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="endSession">
+            <wsdl:documentation>End web service session</wsdl:documentation>
+            <wsdl:input message="typens:endSession" />
+            <wsdl:output message="typens:endSessionResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="login">
+            <wsdl:documentation>Login user and retrive session id</wsdl:documentation>
+            <wsdl:input message="typens:login" />
+            <wsdl:output message="typens:loginResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="startSession">
+            <wsdl:documentation>Start web service session</wsdl:documentation>
+            <wsdl:input message="typens:startSession" />
+            <wsdl:output message="typens:startSessionResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="resources">
+            <wsdl:documentation>List of available resources</wsdl:documentation>
+            <wsdl:input message="typens:resourcesRequest" />
+            <wsdl:output message="typens:resourcesResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="globalFaults">
+            <wsdl:documentation>List of global faults</wsdl:documentation>
+            <wsdl:input message="typens:globalFaults" />
+            <wsdl:output message="typens:globalFaultsResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="resourceFaults">
+            <wsdl:documentation>List of resource faults</wsdl:documentation>
+            <wsdl:input message="typens:resourceFaults" />
+            <wsdl:output message="typens:resourceFaultsResponse" />
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="{{var wsdl.handler}}Binding" type="typens:{{var wsdl.handler}}PortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="call">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="multiCall">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="endSession">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="login">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="startSession">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="resources">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="globalFaults">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="resourceFaults">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="{{var wsdl.name}}Service">
+        <wsdl:port name="{{var wsdl.handler}}Port" binding="typens:{{var wsdl.handler}}Binding">
+            <soap:address location="{{var wsdl.url}}" />
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost.php b/app/code/core/Mage/Authorizenet/Model/Directpost.php
index 04ed04caa6..b42c27896e 100644
--- a/app/code/core/Mage/Authorizenet/Model/Directpost.php
+++ b/app/code/core/Mage/Authorizenet/Model/Directpost.php
@@ -294,6 +294,9 @@ public function getCgiUrl()
      */
     public function getRelayUrl($storeId = null)
     {
+        if ($storeId == null && $this->getStore()) {
+            $storeId = $this->getStore();
+        }
         return Mage::app()->getStore($storeId)
             ->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK).
             'authorizenet/directpost_payment/response';
@@ -387,7 +390,9 @@ public function validateResponse()
     {
         $response = $this->getResponse();
         //md5 check
-        if (!$response->isValidHash($this->getConfigData('trans_md5'), $this->getConfigData('login'))) {
+        if (!$this->getConfigData('trans_md5') || !$this->getConfigData('login') ||
+            !$response->isValidHash($this->getConfigData('trans_md5'), $this->getConfigData('login'))
+        ) {
             Mage::throwException(
                 Mage::helper('authorizenet')->__('Response hash validation failed. Transaction declined.')
             );
@@ -617,7 +622,8 @@ protected function _captureOrder(Mage_Sales_Model_Order $order)
                 if ($order->getState() == Mage_Sales_Model_Order::STATE_PROCESSING) {
                     $orderStatus = $this->getConfigData('order_status');
                     if (!$orderStatus || $order->getIsVirtual()) {
-                        $orderStatus = $order->getConfig()->getStateDefaultStatus(Mage_Sales_Model_Order::STATE_PROCESSING);
+                        $orderStatus = $order->getConfig()
+                                ->getStateDefaultStatus(Mage_Sales_Model_Order::STATE_PROCESSING);
                     }
                     if ($orderStatus) {
                         $order->setStatus($orderStatus);
diff --git a/app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php b/app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php
index 9c35b15617..41691e86b9 100644
--- a/app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php
+++ b/app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php
@@ -73,7 +73,7 @@ public function placeAction()
         $paymentParam = $this->getRequest()->getParam('payment');
         $controller = $this->getRequest()->getParam('controller');
         $this->getRequest()->setPost('collect_shipping_rates', 1);
-        $this->_processData();
+        $this->_processActionData('save');
 
         //get confirmation by email flag
         $orderData = $this->getRequest()->getPost('order');
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index 2fe47a328a..163b7025a9 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -151,7 +151,7 @@ protected function _isSelected($selection)
     protected function _getSelectedQty()
     {
         if ($this->getProduct()->hasPreconfiguredValues()) {
-            $selectedQty = (int)$this->getProduct()->getPreconfiguredValues()
+            $selectedQty = (float)$this->getProduct()->getPreconfiguredValues()
                 ->getData('bundle_option_qty/' . $this->getOption()->getId());
             if ($selectedQty < 0) {
                 $selectedQty = 0;
diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php
index 91d197159f..928693fd20 100644
--- a/app/code/core/Mage/Bundle/Model/Product/Type.php
+++ b/app/code/core/Mage/Bundle/Model/Product/Type.php
@@ -259,12 +259,13 @@ public function beforeSave($product = null)
     public function save($product = null)
     {
         parent::save($product);
+        $product = $this->getProduct($product);
         /* @var $resource Mage_Bundle_Model_Mysql4_Bundle */
         $resource = Mage::getResourceModel('bundle/bundle');
 
-        $options = $this->getProduct($product)->getBundleOptionsData();
+        $options = $product->getBundleOptionsData();
         if ($options) {
-            $this->getProduct($product)->setIsRelationsChanged(true);
+            $product->setIsRelationsChanged(true);
 
             foreach ($options as $key => $option) {
                 if (isset($option['option_id']) && $option['option_id'] == '') {
@@ -273,8 +274,8 @@ public function save($product = null)
 
                 $optionModel = Mage::getModel('bundle/option')
                     ->setData($option)
-                    ->setParentId($this->getProduct($product)->getId())
-                    ->setStoreId($this->getProduct($product)->getStoreId());
+                    ->setParentId($product->getId())
+                    ->setStoreId($product->getStoreId());
 
                 $optionModel->isDeleted((bool)$option['delete']);
                 $optionModel->save();
@@ -285,7 +286,7 @@ public function save($product = null)
             $usedProductIds      = array();
             $excludeSelectionIds = array();
 
-            $selections = $this->getProduct($product)->getBundleSelectionsData();
+            $selections = $product->getBundleSelectionsData();
             if ($selections) {
                 foreach ($selections as $index => $group) {
                     foreach ($group as $key => $selection) {
@@ -300,7 +301,7 @@ public function save($product = null)
                         $selectionModel = Mage::getModel('bundle/selection')
                             ->setData($selection)
                             ->setOptionId($options[$index]['option_id'])
-                            ->setParentProductId($this->getProduct($product)->getId());
+                            ->setParentProductId($product->getId());
 
                         $selectionModel->isDeleted((bool)$selection['delete']);
                         $selectionModel->save();
@@ -314,12 +315,12 @@ public function save($product = null)
                     }
                 }
 
-                $resource->dropAllUnneededSelections($this->getProduct($product)->getId(), $excludeSelectionIds);
-                $resource->saveProductRelations($this->getProduct($product)->getId(), array_unique($usedProductIds));
+                $resource->dropAllUnneededSelections($product->getId(), $excludeSelectionIds);
+                $resource->saveProductRelations($product->getId(), array_unique($usedProductIds));
             }
 
-            if ($this->getProduct($product)->getData('price_type') != $this->getProduct($product)->getOrigData('price_type')) {
-                $resource->dropAllQuoteChildItems($this->getProduct($product)->getId());
+            if ($product->getData('price_type') != $product->getOrigData('price_type')) {
+                $resource->dropAllQuoteChildItems($product->getId());
             }
         }
 
@@ -787,7 +788,11 @@ public function getOrderOptions($product = null)
                 if ($selection->isSalable()) {
                     $selectionQty = $product->getCustomOption('selection_qty_' . $selection->getSelectionId());
                     if ($selectionQty) {
-                        $price = $product->getPriceModel()->getSelectionPrice($product, $selection, $selectionQty->getValue());
+                        $price = $product->getPriceModel()->getSelectionPrice(
+                            $product,
+                            $selection,
+                            $selectionQty->getValue()
+                        );
 
                         $option = $options->getItemById($selection->getOptionId());
                         if (!isset($bundleOptions[$option->getId()])) {
@@ -988,4 +993,18 @@ public function processBuyRequest($product, $buyRequest)
 
         return $options;
     }
+
+    /**
+     * Check if product can be configured
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @return bool
+     */
+    public function canConfigure($product = null)
+    {
+        return $product instanceof Mage_Catalog_Model_Product
+            && $product->isAvailable()
+            && parent::canConfigure();
+    }
+
 }
diff --git a/app/code/core/Mage/Catalog/Block/Layer/View.php b/app/code/core/Mage/Catalog/Block/Layer/View.php
index 1d777507d5..31ec010c3c 100644
--- a/app/code/core/Mage/Catalog/Block/Layer/View.php
+++ b/app/code/core/Mage/Catalog/Block/Layer/View.php
@@ -49,7 +49,7 @@ class Mage_Catalog_Block_Layer_View extends Mage_Core_Block_Template
 
     /**
      * Attribute Filter Block Name
-     * 
+     *
      * @var string
      */
     protected $_attributeFilterBlockName;
@@ -83,11 +83,11 @@ protected function _construct()
      */
     protected function _initBlocks()
     {
-        $this->_stateBlockName = 'catalog/layer_state';
-        $this->_categoryBlockName = 'catalog/layer_filter_category';
-        $this->_attributeFilterBlockName = 'catalog/layer_filter_attribute';
-        $this->_priceFilterBlockName = 'catalog/layer_filter_price';
-        $this->_decimalFilterBlockName = 'catalog/layer_filter_decimal';
+        $this->_stateBlockName              = 'catalog/layer_state';
+        $this->_categoryBlockName           = 'catalog/layer_filter_category';
+        $this->_attributeFilterBlockName    = 'catalog/layer_filter_attribute';
+        $this->_priceFilterBlockName        = 'catalog/layer_filter_price';
+        $this->_decimalFilterBlockName      = 'catalog/layer_filter_decimal';
     }
 
     /**
@@ -123,11 +123,9 @@ protected function _prepareLayout()
         foreach ($filterableAttributes as $attribute) {
             if ($attribute->getAttributeCode() == 'price') {
                 $filterBlockName = $this->_priceFilterBlockName;
-            }
-            elseif ($attribute->getBackendType() == 'decimal') {
+            } elseif ($attribute->getBackendType() == 'decimal') {
                 $filterBlockName = $this->_decimalFilterBlockName;
-            }
-            else {
+            } else {
                 $filterBlockName = $this->_attributeFilterBlockName;
             }
 
diff --git a/app/code/core/Mage/Catalog/Block/Product/Gallery.php b/app/code/core/Mage/Catalog/Block/Product/Gallery.php
index e0ccc7b420..af76499a92 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Gallery.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Gallery.php
@@ -74,15 +74,25 @@ public function getImageFile()
         return $this->getCurrentImage()->getFile();
     }
 
+    /**
+     * Retrieve image width
+     *
+     * @return bool|int
+     */
     public function getImageWidth()
     {
         $file = $this->getCurrentImage()->getPath();
         if (file_exists($file)) {
             $size = getimagesize($file);
-            if (isset($size[0]) && $size[0]>600) {
-                return 600;
+            if (isset($size[0])) {
+                if ($size[0] > 600) {
+                    return 600;
+                } else {
+                    return $size[0];
+                }
             }
         }
+
         return false;
     }
 
diff --git a/app/code/core/Mage/Catalog/Block/Product/View.php b/app/code/core/Mage/Catalog/Block/Product/View.php
index c9a1052d88..a0262a851a 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View.php
@@ -146,6 +146,10 @@ public function getJsonConfig()
             'showBothPrices'      => Mage::helper('tax')->displayBothPrices(),
             'productPrice'        => Mage::helper('core')->currency($_finalPrice, false, false),
             'productOldPrice'     => Mage::helper('core')->currency($_regularPrice, false, false),
+            /**
+             * @var skipCalculate
+             * @deprecated after 1.5.1.0
+             */
             'skipCalculate'       => ($_priceExclTax != $_priceInclTax ? 0 : 1),
             'defaultTax'          => $defaultTax,
             'currentTax'          => $currentTax,
diff --git a/app/code/core/Mage/Catalog/Helper/Product.php b/app/code/core/Mage/Catalog/Helper/Product.php
index db8a4a7a7e..ae4775fd9d 100644
--- a/app/code/core/Mage/Catalog/Helper/Product.php
+++ b/app/code/core/Mage/Catalog/Helper/Product.php
@@ -318,7 +318,11 @@ public function initProduct($productId, $controller, $params = null)
 
         try {
             Mage::dispatchEvent('catalog_controller_product_init', array('product' => $product));
-            Mage::dispatchEvent('catalog_controller_product_init_after', array('product' => $product, 'controller_action' => $controller));
+            Mage::dispatchEvent('catalog_controller_product_init_after',
+                            array('product' => $product,
+                                'controller_action' => $controller
+                            )
+            );
         } catch (Mage_Core_Exception $e) {
             Mage::logException($e);
             return false;
@@ -391,4 +395,47 @@ public function addParamsToBuyRequest($buyRequest, $params)
 
         return $buyRequest;
     }
+
+    /**
+     * Return loaded product instance
+     *
+     * @param  int|string $productId (SKU or ID)
+     * @param  int $store
+     * @param  string $identifierType
+     * @return Mage_Catalog_Model_Product
+     */
+    public function getProduct($productId, $store, $identifierType = null) {
+        $loadByIdOnFalse = false;
+        if ($identifierType == null) {
+            if (is_string($productId) && !preg_match("/^[+-]?[1-9][0-9]*$|^0$/", $productId)) {
+                $identifierType = 'sku';
+                $loadByIdOnFalse = true;
+            } else {
+                $identifierType = 'id';
+            }
+        }
+
+        /** @var $product Mage_Catalog_Model_Product */
+        $product = Mage::getModel('catalog/product');
+        if ($store !== null) {
+            $product->setStoreId($store);
+        }
+        if ($identifierType == 'sku') {
+            $idBySku = $product->getIdBySku($productId);
+            if ($idBySku) {
+                $productId = $idBySku;
+            }
+            if ($loadByIdOnFalse) {
+                $identifierType = 'id';
+            }
+        }
+
+        if ($identifierType == 'id' && is_numeric($productId)) {
+            $productId = !is_float($productId) ? (int) $productId : 0;
+            $product->load($productId);
+        }
+
+        return $product;
+    }
+
 }
diff --git a/app/code/core/Mage/Catalog/Model/Api/Resource.php b/app/code/core/Mage/Catalog/Model/Api/Resource.php
index 4aa7454a3d..d4e86e5d5a 100644
--- a/app/code/core/Mage/Catalog/Model/Api/Resource.php
+++ b/app/code/core/Mage/Catalog/Model/Api/Resource.php
@@ -100,31 +100,12 @@ protected function _getStoreId($store = null)
      *
      * @param  int|string $productId (SKU or ID)
      * @param  int|string $store
+     * @param  string $identifierType
      * @return Mage_Catalog_Model_Product
      */
     protected function _getProduct($productId, $store = null, $identifierType = null)
     {
-        $loadByIdOnFalse = false;
-        if ($identifierType == null) {
-            $identifierType = 'sku';
-            $loadByIdOnFalse = true;
-        }
-        $product = Mage::getModel('catalog/product');
-        if ($store !== null) {
-            $product->setStoreId($this->_getStoreId($store));
-        }
-        /* @var $product Mage_Catalog_Model_Product */
-        if ($identifierType == 'sku') {
-            $idBySku = $product->getIdBySku($productId);
-            if ($idBySku) {
-                $productId = $idBySku;
-            }
-            if ($idBySku || $loadByIdOnFalse) {
-                $product->load($productId);
-            }
-        } elseif ($identifierType == 'id') {
-            $product->load($productId);
-        }
+        $product = Mage::helper('catalog/product')->getProduct($productId, $this->_getStoreId($store), $identifierType);
         return $product;
     }
 
diff --git a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
index d26e075ead..092dadbd5e 100644
--- a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
+++ b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
@@ -44,19 +44,23 @@ class Mage_Catalog_Model_Attribute_Backend_Customlayoutupdate extends Mage_Eav_M
     */
     public function validate($object)
     {
-       $attributeName = $this->getAttribute()->getName();
-       $updates = trim($object->getData($attributeName));
+        $attributeName = $this->getAttribute()->getName();
+        $xml = trim($object->getData($attributeName));
 
-       if (!$this->getAttribute()->getIsRequired() && empty($updates)) {
-           return true;
-       }
+        if (!$this->getAttribute()->getIsRequired() && empty($xml)) {
+            return true;
+        }
 
-       try {
-           new Varien_Simplexml_Element($updates);
-       } catch(Exception $e) {
-           $eavExc = new Mage_Eav_Model_Entity_Attribute_Exception(Mage::helper('catalog/product')->__('Please enter valid XML data.'));
-           $eavExc->setAttributeCode($attributeName);
-           throw $eavExc;
-       }
+        /** @var $validator Mage_Adminhtml_Model_LayoutUpdate_Validator */
+        $validator = Mage::getModel('adminhtml/layoutUpdate_validator');
+        if (!$validator->isValid($xml)) {
+            $messages = $validator->getMessages();
+            //Add first message to exception
+            $massage = array_shift($messages);
+            $eavExc = new Mage_Eav_Model_Entity_Attribute_Exception($massage);
+            $eavExc->setAttributeCode($attributeName);
+            throw $eavExc;
+        }
+        return true;
     }
 }
diff --git a/app/code/core/Mage/Catalog/Model/Category/Api.php b/app/code/core/Mage/Catalog/Model/Category/Api.php
index 45aa064b73..71dfdd2350 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Api.php
@@ -386,34 +386,16 @@ public function delete($categoryId)
      * Get prduct Id from sku or from product id
      *
      * @param int|string $productId
+     * @param  string $identifierType
      * @return int
      */
     protected function _getProductId($productId, $identifierType = null)
     {
-        $loadByIdOnFalse = false;
-        if ($identifierType === null) {
-            $identifierType = 'sku';
-            $loadByIdOnFalse = true;
-        }
-        $product = Mage::getModel('catalog/product');
-
-        if ($identifierType == 'sku') {
-            $idBySku = $product->getIdBySku($productId);
-            if ($idBySku) {
-                $productId = $idBySku;
-            }
-            if ($idBySku || $loadByIdOnFalse) {
-                $product->load($productId);
-            }
-        } elseif ($identifierType == 'id') {
-            $product->load($productId);
-        }
-
+        $product = Mage::helper('catalog/product')->getProduct($productId, null, $identifierType);
         if (!$product->getId()) {
             $this->_fault('not_exists','Product not exists.');
         }
-
-        return $productId;
+        return $product->getId();
     }
 
 
diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php
index d30e3aa5a0..8b769ff1e4 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php
@@ -54,16 +54,15 @@ public function afterSave($object)
         $path = Mage::getBaseDir('media') . DS . 'catalog' . DS . 'category' . DS;
 
         try {
-            $uploader = new Varien_File_Uploader($this->getAttribute()->getName());
+            $uploader = new Mage_Core_Model_File_Uploader($this->getAttribute()->getName());
             $uploader->setAllowedExtensions(array('jpg','jpeg','gif','png'));
             $uploader->setAllowRenameFiles(true);
             $result = $uploader->save($path);
-            $result['file'] = Mage::helper('core/file_storage_database')->saveUploadedFile($result);
 
             $object->setData($this->getAttribute()->getName(), $result['file']);
             $this->getAttribute()->getEntity()->saveAttribute($object, $this->getAttribute()->getName());
         } catch (Exception $e) {
-            if ($e->getCode() != Varien_File_Uploader::TMP_NAME_EMPTY) {
+            if ($e->getCode() != Mage_Core_Model_File_Uploader::TMP_NAME_EMPTY) {
                 Mage::logException($e);
             }
             /** @TODO ??? */
diff --git a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php
index e0a0aac4f0..852ea9c565 100644
--- a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php
@@ -117,8 +117,8 @@ public function load()
         $filters = $this->_parseVars();
 
         if ($qty = $this->getFieldValue($filters, 'qty')) {
-            $qtyFrom = isset($qty['from']) ? $qty['from'] : 0;
-            $qtyTo   = isset($qty['to']) ? $qty['to'] : 0;
+            $qtyFrom = isset($qty['from']) ? (float) $qty['from'] : 0;
+            $qtyTo   = isset($qty['to']) ? (float) $qty['to'] : 0;
 
             $qtyAttr = array();
             $qtyAttr['alias']       = 'qty';
@@ -413,7 +413,10 @@ public function save()
         if ($collections instanceof Mage_Catalog_Model_Entity_Product_Collection) {
             $collections = array($collections->getEntity()->getStoreId()=>$collections);
         } elseif (!is_array($collections)) {
-            $this->addException(Mage::helper('catalog')->__('No product collections found.'), Mage_Dataflow_Model_Convert_Exception::FATAL);
+            $this->addException(
+                Mage::helper('catalog')->__('No product collections found.'),
+                Mage_Dataflow_Model_Convert_Exception::FATAL
+            );
         }
 
         //$stockItems = $this->getInventoryItems();
@@ -422,7 +425,10 @@ public function save()
             $this->addException(Mage::helper('catalog')->__('Records for "'.$stores[$storeId].'" store found.'));
 
             if (!$collection instanceof Mage_Catalog_Model_Entity_Product_Collection) {
-                $this->addException(Mage::helper('catalog')->__('Product collection expected.'), Mage_Dataflow_Model_Convert_Exception::FATAL);
+                $this->addException(
+                    Mage::helper('catalog')->__('Product collection expected.'),
+                    Mage_Dataflow_Model_Convert_Exception::FATAL
+                );
             }
             try {
                 $i = 0;
@@ -448,7 +454,10 @@ public function save()
                     }
                     if (!$new || 0!==$storeId) {
                         if (0!==$storeId) {
-                            Mage::getResourceSingleton('catalog_entity/convert')->addProductToStore($model->getId(), $storeId);
+                            Mage::getResourceSingleton('catalog_entity/convert')->addProductToStore(
+                                $model->getId(),
+                                $storeId
+                            );
                         }
                         $model->save();
                     }
@@ -493,8 +502,13 @@ public function save()
                 $this->addException(Mage::helper('catalog')->__("Saved %d record(s)", $i));
             } catch (Exception $e) {
                 if (!$e instanceof Mage_Dataflow_Model_Convert_Exception) {
-                    $this->addException(Mage::helper('catalog')->__('An error occurred while saving the collection, aborting. Error message: %s', $e->getMessage()),
-                        Mage_Dataflow_Model_Convert_Exception::FATAL);
+                    $this->addException(
+                        Mage::helper('catalog')->__(
+                            'An error occurred while saving the collection, aborting. Error message: %s',
+                            $e->getMessage()
+                        ),
+                        Mage_Dataflow_Model_Convert_Exception::FATAL
+                    );
                 }
             }
         }
@@ -519,7 +533,10 @@ public function saveRow(array $importData)
             if (!is_null($this->getBatchParams('store'))) {
                 $store = $this->getStoreById($this->getBatchParams('store'));
             } else {
-                $message = Mage::helper('catalog')->__('Skipping import row, required field "%s" is not defined.', 'store');
+                $message = Mage::helper('catalog')->__(
+                    'Skipping import row, required field "%s" is not defined.',
+                    'store'
+                );
                 Mage::throwException($message);
             }
         }
@@ -528,7 +545,10 @@ public function saveRow(array $importData)
         }
 
         if ($store === false) {
-            $message = Mage::helper('catalog')->__('Skipping import row, store "%s" field does not exist.', $importData['store']);
+            $message = Mage::helper('catalog')->__(
+                'Skipping import row, store "%s" field does not exist.',
+                $importData['store']
+            );
             Mage::throwException($message);
         }
 
@@ -551,7 +571,11 @@ public function saveRow(array $importData)
              */
             if (empty($importData['type']) || !isset($productTypes[strtolower($importData['type'])])) {
                 $value = isset($importData['type']) ? $importData['type'] : '';
-                $message = Mage::helper('catalog')->__('Skip import row, is not valid value "%s" for field "%s"', $value, 'type');
+                $message = Mage::helper('catalog')->__(
+                    'Skip import row, is not valid value "%s" for field "%s"',
+                    $value,
+                    'type'
+                );
                 Mage::throwException($message);
             }
             $product->setTypeId($productTypes[strtolower($importData['type'])]);
@@ -560,7 +584,11 @@ public function saveRow(array $importData)
              */
             if (empty($importData['attribute_set']) || !isset($productAttributeSets[$importData['attribute_set']])) {
                 $value = isset($importData['attribute_set']) ? $importData['attribute_set'] : '';
-                $message = Mage::helper('catalog')->__('Skip import row, the value "%s" is invalid for field "%s"', $value, 'attribute_set');
+                $message = Mage::helper('catalog')->__(
+                    'Skip import row, the value "%s" is invalid for field "%s"',
+                    $value,
+                    'attribute_set'
+                );
                 Mage::throwException($message);
             }
             $product->setAttributeSetId($productAttributeSets[$importData['attribute_set']]);
@@ -568,7 +596,10 @@ public function saveRow(array $importData)
             foreach ($this->_requiredFields as $field) {
                 $attribute = $this->getAttribute($field);
                 if (!isset($importData[$field]) && $attribute && $attribute->getIsRequired()) {
-                    $message = Mage::helper('catalog')->__('Skipping import row, required field "%s" for new products is not defined.', $field);
+                    $message = Mage::helper('catalog')->__(
+                        'Skipping import row, required field "%s" for new products is not defined.',
+                        $field
+                    );
                     Mage::throwException($message);
                 }
             }
@@ -690,15 +721,19 @@ public function saveRow(array $importData)
 
         foreach ($product->getMediaAttributes() as $mediaAttributeCode => $mediaAttribute) {
             if (isset($importData[$mediaAttributeCode])) {
-                $file = $importData[$mediaAttributeCode];
-                if (trim($file) && !$mediaGalleryBackendModel->getImage($product, $file)) {
+                $file = trim($importData[$mediaAttributeCode]);
+                if (!empty($file) && !$mediaGalleryBackendModel->getImage($product, $file)) {
                     $arrayToMassAdd[] = array('file' => trim($file), 'mediaAttribute' => $mediaAttributeCode);
                 }
             }
         }
 
-        $addedFilesCorrespondence =
-            $mediaGalleryBackendModel->addImagesWithDifferentMediaAttributes($product, $arrayToMassAdd, Mage::getBaseDir('media') . DS . 'import', false, false);
+        $addedFilesCorrespondence = $mediaGalleryBackendModel->addImagesWithDifferentMediaAttributes(
+            $product,
+            $arrayToMassAdd, Mage::getBaseDir('media') . DS . 'import',
+            false,
+            false
+        );
 
         foreach ($product->getMediaAttributes() as $mediaAttributeCode => $mediaAttribute) {
             $addedFile = '';
diff --git a/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php b/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php
index bd689f2ba4..0b3e7177f4 100644
--- a/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php
@@ -186,9 +186,11 @@ public function getStore()
         if (is_null($this->_store)) {
             try {
                 $store = Mage::app()->getStore($this->getVar('store'));
-            }
-            catch (Exception $e) {
-                $this->addException(Mage::helper('catalog')->__('Invalid store specified'), Varien_Convert_Exception::FATAL);
+            } catch (Exception $e) {
+                $this->addException(
+                    Mage::helper('catalog')->__('Invalid store specified'),
+                    Varien_Convert_Exception::FATAL
+                );
                 throw $e;
             }
             $this->_store = $store;
@@ -258,18 +260,19 @@ public function getAttribute($code)
      */
     public function parse()
     {
-        $data = $this->getData();
-
-        $entityTypeId = Mage::getSingleton('eav/config')->getEntityType('catalog_product')->getId();
+        $data               = $this->getData();
+        $entityTypeId       = Mage::getSingleton('eav/config')->getEntityType('catalog_product')->getId();
+        $inventoryFields    = array();
 
-        $result = array();
-        $inventoryFields = array();
         foreach ($data as $i=>$row) {
             $this->setPosition('Line: '.($i+1));
             try {
                 // validate SKU
                 if (empty($row['sku'])) {
-                    $this->addException(Mage::helper('catalog')->__('Missing SKU, skipping the record.'), Mage_Dataflow_Model_Convert_Exception::ERROR);
+                    $this->addException(
+                        Mage::helper('catalog')->__('Missing SKU, skipping the record.'),
+                        Mage_Dataflow_Model_Convert_Exception::ERROR
+                    );
                     continue;
                 }
                 $this->setPosition('Line: '.($i+1).', SKU: '.$row['sku']);
@@ -286,7 +289,10 @@ public function parse()
                 // get attribute_set_id, if not throw error
                 $row['attribute_set_id'] = $this->getAttributeSetId($entityTypeId, $row['attribute_set']);
                 if (!$row['attribute_set_id']) {
-                    $this->addException(Mage::helper('catalog')->__("Invalid attribute set specified, skipping the record."), Mage_Dataflow_Model_Convert_Exception::ERROR);
+                    $this->addException(
+                        Mage::helper('catalog')->__('Invalid attribute set specified, skipping the record.'),
+                        Mage_Dataflow_Model_Convert_Exception::ERROR
+                    );
                     continue;
                 }
 
@@ -296,14 +302,20 @@ public function parse()
                 // get product type_id, if not throw error
                 $row['type_id'] = $this->getProductTypeId($row['type']);
                 if (!$row['type_id']) {
-                    $this->addException(Mage::helper('catalog')->__("Invalid product type specified, skipping the record."), Mage_Dataflow_Model_Convert_Exception::ERROR);
+                    $this->addException(
+                        Mage::helper('catalog')->__('Invalid product type specified, skipping the record.'),
+                        Mage_Dataflow_Model_Convert_Exception::ERROR
+                    );
                     continue;
                 }
 
                 // get store ids
                 $storeIds = $this->getStoreIds(isset($row['store']) ? $row['store'] : $this->getVar('store'));
                 if (!$storeIds) {
-                    $this->addException(Mage::helper('catalog')->__("Invalid store specified, skipping the record."), Mage_Dataflow_Model_Convert_Exception::ERROR);
+                    $this->addException(
+                        Mage::helper('catalog')->__('Invalid store specified, skipping the record.'),
+                        Mage_Dataflow_Model_Convert_Exception::ERROR
+                    );
                     continue;
                 }
 
@@ -328,14 +340,20 @@ public function parse()
                                 $inventoryFields[$row['sku']][$field] = $value;
                             }
                             continue;
-                            #$this->addException(Mage::helper('catalog')->__("Unknown attribute: %s.", $field), Mage_Dataflow_Model_Convert_Exception::ERROR);
+//                            $this->addException(
+//                                Mage::helper('catalog')->__('Unknown attribute: %s.', $field),
+//                                Mage_Dataflow_Model_Convert_Exception::ERROR
+//                            );
                         }
                         if ($attribute->usesSource()) {
                             $source = $attribute->getSource();
                             $optionId = $this->getSourceOptionId($source, $value);
                             if (is_null($optionId)) {
                                 $rowError = true;
-                                $this->addException(Mage::helper('catalog')->__("Invalid attribute option specified for attribute %s (%s), skipping the record.", $field, $value), Mage_Dataflow_Model_Convert_Exception::ERROR);
+                                $this->addException(
+                                    Mage::helper('catalog')->__('Invalid attribute option specified for attribute %s (%s), skipping the record.', $field, $value),
+                                    Mage_Dataflow_Model_Convert_Exception::ERROR
+                                );
                                 continue;
                             }
                             $value = $optionId;
@@ -353,7 +371,10 @@ public function parse()
                 } //foreach ($storeIds as $storeId)
             } catch (Exception $e) {
                 if (!$e instanceof Mage_Dataflow_Model_Convert_Exception) {
-                    $this->addException(Mage::helper('catalog')->__("Error during retrieval of option value: %s", $e->getMessage()), Mage_Dataflow_Model_Convert_Exception::FATAL);
+                    $this->addException(
+                        Mage::helper('catalog')->__('Error during retrieval of option value: %s', $e->getMessage()),
+                        Mage_Dataflow_Model_Convert_Exception::FATAL
+                    );
                 }
             }
         }
@@ -400,7 +421,8 @@ public function unparse()
             $row = array(
                 'store'         => $this->getStore()->getCode(),
                 'websites'      => '',
-                'attribute_set' => $this->getAttributeSetName($product->getEntityTypeId(), $product->getAttributeSetId()),
+                'attribute_set' => $this->getAttributeSetName($product->getEntityTypeId(),
+                                        $product->getAttributeSetId()),
                 'type'          => $product->getTypeId(),
                 'category_ids'  => join(',', $product->getCategoryIds())
             );
@@ -412,8 +434,7 @@ public function unparse()
                     $websiteCodes[$websiteCode] = $websiteCode;
                 }
                 $row['websites'] = join(',', $websiteCodes);
-            }
-            else {
+            } else {
                 $row['websites'] = $this->getStore()->getWebsite()->getCode();
                 if ($this->getVar('url_field')) {
                     $row['url'] = $product->getProductUrl(false);
@@ -432,9 +453,11 @@ public function unparse()
 
                 if ($attribute->usesSource()) {
                     $option = $attribute->getSource()->getOptionText($value);
-                    if ($value && empty($option)) {
-                        $message = Mage::helper('catalog')->__("Invalid option ID specified for %s (%s), skipping the record.", $field, $value);
-                        $this->addException($message, Mage_Dataflow_Model_Convert_Exception::ERROR);
+                    if ($value && empty($option) && $option != '0') {
+                        $this->addException(
+                            Mage::helper('catalog')->__('Invalid option ID specified for %s (%s), skipping the record.', $field, $value),
+                            Mage_Dataflow_Model_Convert_Exception::ERROR
+                        );
                         continue;
                     }
                     if (is_array($option)) {
@@ -443,8 +466,7 @@ public function unparse()
                         $value = $option;
                     }
                     unset($option);
-                }
-                elseif (is_array($value)) {
+                } elseif (is_array($value)) {
                     continue;
                 }
 
@@ -485,11 +507,8 @@ public function unparse()
      */
     public function getExternalAttributes()
     {
-        $entityTypeId = Mage::getSingleton('eav/config')->getEntityType('catalog_product')->getId();
-        $productAttributes = Mage::getResourceModel('catalog/product_attribute_collection')
-            ->load();
-
-        $attributes = $this->_externalFields;
+        $productAttributes  = Mage::getResourceModel('catalog/product_attribute_collection')->load();
+        $attributes         = $this->_externalFields;
 
         foreach ($productAttributes as $attr) {
             $code = $attr->getAttributeCode();
diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php
index 458a26a166..301ac667a6 100644
--- a/app/code/core/Mage/Catalog/Model/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Product.php
@@ -646,8 +646,9 @@ public function getFormatedPrice()
     /**
      * Sets final price of product
      *
-     * This func is equal to magic 'setFinalPrice()', but added as a separate func, because in cart with bundle products it's called
-     * very often in Item->getProduct(). So removing chain of magic with more cpu consuming algorithms gives nice optimization boost.
+     * This func is equal to magic 'setFinalPrice()', but added as a separate func, because in cart with bundle
+     * products it's called very often in Item->getProduct(). So removing chain of magic with more cpu consuming
+     * algorithms gives nice optimization boost.
      *
      * @return Mage_Catalog_Model_Product
      */
@@ -679,7 +680,7 @@ public function getCalculatedFinalPrice()
 
     public function getMinimalPrice()
     {
-        return $this->_getData('minimal_price');
+        return max($this->_getData('minimal_price'), 0);
     }
 
     public function getSpecialPrice()
@@ -995,7 +996,10 @@ public function duplicate()
             ->setId(null)
             ->setStoreId(Mage::app()->getStore()->getId());
 
-        Mage::dispatchEvent('catalog_model_product_duplicate', array('current_product'=>$this, 'new_product'=>$newProduct));
+        Mage::dispatchEvent(
+            'catalog_model_product_duplicate',
+            array('current_product'=>$this, 'new_product'=>$newProduct)
+        );
 
         /* @var $newProduct Mage_Catalog_Model_Product */
 
diff --git a/app/code/core/Mage/Catalog/Model/Product/Api.php b/app/code/core/Mage/Catalog/Model/Product/Api.php
index 870609f19e..e259e5e4b3 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Api.php
@@ -130,18 +130,20 @@ public function info($productId, $store = null, $attributes = null, $identifierT
      *
      * @param string $type
      * @param int $set
+     * @param string $sku
      * @param array $productData
+     * @param string $store
      * @return int
      */
-    public function create($type, $set, $sku, $productData)
+    public function create($type, $set, $sku, $productData, $store = null)
     {
         if (!$type || !$set || !$sku) {
             $this->_fault('data_invalid');
         }
 
+        /** @var $product Mage_Catalog_Model_Product */
         $product = Mage::getModel('catalog/product');
-        /* @var $product Mage_Catalog_Model_Product */
-        $product->setStoreId($this->_getStoreId())
+        $product->setStoreId($this->_getStoreId($store))
             ->setAttributeSetId($set)
             ->setTypeId($type)
             ->setSku($sku);
diff --git a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php
index 22bc9b48d7..85817f0ad5 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php
@@ -119,12 +119,18 @@ public function info($productId, $store = null, $attributes = null, $identifierT
         );
 
         $allAttributes = array();
-        if (isset($attributes->attributes)) {
-            $allAttributes += array_merge($allAttributes, $attributes->attributes);
+        if (!empty($attributes->attributes)) {
+            $allAttributes = array_merge($allAttributes, $attributes->attributes);
+        } else {
+            foreach ($product->getTypeInstance(true)->getEditableAttributes($product) as $attribute) {
+                if ($this->_isAllowedAttribute($attribute, $attributes)) {
+                    $allAttributes[] = $attribute->getAttributeCode();
+                }
+            }
         }
 
         $_additionalAttributeCodes = array();
-        if (isset($attributes->additional_attributes)) {
+        if (!empty($attributes->additional_attributes)) {
             foreach ($attributes->additional_attributes as $k => $_attributeCode) {
                 $allAttributes[] = $_attributeCode;
                 $_additionalAttributeCodes[] = $_attributeCode;
@@ -152,17 +158,20 @@ public function info($productId, $store = null, $attributes = null, $identifierT
      *
      * @param string $type
      * @param int $set
+     * @param string $sku
      * @param array $productData
+     * @param string $store
      * @return int
      */
-    public function create($type, $set, $sku, $productData)
+    public function create($type, $set, $sku, $productData, $store = null)
     {
         if (!$type || !$set || !$sku) {
             $this->_fault('data_invalid');
         }
+
+        /** @var $product Mage_Catalog_Model_Product */
         $product = Mage::getModel('catalog/product');
-        /* @var $product Mage_Catalog_Model_Product */
-        $product->setStoreId($this->_getStoreId())
+        $product->setStoreId($this->_getStoreId($store))
             ->setAttributeSetId($set)
             ->setTypeId($type)
             ->setSku($sku);
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
index b29720437c..16e8e48369 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
@@ -240,7 +240,8 @@ public function afterSave($object)
      * @param boolean                    $exclude           mark image as disabled in product page view
      * @return string
      */
-    public function addImage(Mage_Catalog_Model_Product $product, $file, $mediaAttribute=null, $move=false, $exclude=true)
+    public function addImage(Mage_Catalog_Model_Product $product, $file,
+        $mediaAttribute = null, $move = false, $exclude = true)
     {
         $file = realpath($file);
 
@@ -248,12 +249,13 @@ public function addImage(Mage_Catalog_Model_Product $product, $file, $mediaAttri
             Mage::throwException(Mage::helper('catalog')->__('Image does not exist.'));
         }
         $pathinfo = pathinfo($file);
-        if (!isset($pathinfo['extension']) || !in_array(strtolower($pathinfo['extension']), array('jpg','jpeg','gif','png'))) {
+        $imgExtensions = array('jpg','jpeg','gif','png');
+        if (!isset($pathinfo['extension']) || !in_array(strtolower($pathinfo['extension']), $imgExtensions)) {
             Mage::throwException(Mage::helper('catalog')->__('Invalid image file type.'));
         }
 
-        $fileName       = Varien_File_Uploader::getCorrectFileName($pathinfo['basename']);
-        $dispretionPath = Varien_File_Uploader::getDispretionPath($fileName);
+        $fileName       = Mage_Core_Model_File_Uploader::getCorrectFileName($pathinfo['basename']);
+        $dispretionPath = Mage_Core_Model_File_Uploader::getDispretionPath($fileName);
         $fileName       = $dispretionPath . DS . $fileName;
 
         $fileName = $this->_getNotDuplicatedFilename($fileName, $dispretionPath);
@@ -267,15 +269,17 @@ public function addImage(Mage_Catalog_Model_Product $product, $file, $mediaAttri
                 'path'=>$distanationDirectory
             ));
 
+            /** @var $storageHelper Mage_Core_Helper_File_Storage_Database */
+            $storageHelper = Mage::helper('core/file_storage_database');
             if ($move) {
                 $ioAdapter->mv($file, $this->_getConfig()->getTmpMediaPath($fileName));
 
-                //If this is used, filesystem shoild be configured properly
-                Mage::helper('core/file_storage_database')->saveFile($this->_getConfig()->getTmpMediaShortUrl($fileName));
+                //If this is used, filesystem should be configured properly
+                $storageHelper->saveFile($this->_getConfig()->getTmpMediaShortUrl($fileName));
             } else {
                 $ioAdapter->cp($file, $this->_getConfig()->getTmpMediaPath($fileName));
 
-                Mage::helper('core/file_storage_database')->saveFile($this->_getConfig()->getTmpMediaShortUrl($fileName));
+                $storageHelper->saveFile($this->_getConfig()->getTmpMediaShortUrl($fileName));
                 $ioAdapter->chmod($this->_getConfig()->getTmpMediaPath($fileName), 0777);
             }
         }
@@ -535,9 +539,13 @@ protected function _moveImageFromTmp($file)
         }
         $destFile = $this->_getUniqueFileName($file, $ioObject->dirsep());
 
-        if (Mage::helper('core/file_storage_database')->checkDbUsage()) {
-            Mage::helper('core/file_storage_database')
-                ->renameFile($this->_getConfig()->getTmpMediaShortUrl($file), $this->_getConfig()->getMediaShortUrl($destFile));
+        /** @var $storageHelper Mage_Core_Helper_File_Storage_Database */
+        $storageHelper = Mage::helper('core/file_storage_database');
+
+        if ($storageHelper->checkDbUsage()) {
+            $storageHelper->renameFile(
+                $this->_getConfig()->getTmpMediaShortUrl($file),
+                $this->_getConfig()->getMediaShortUrl($destFile));
 
             $ioObject->rm($this->_getConfig()->getTmpMediaPath($file));
             $ioObject->rm($this->_getConfig()->getMediaPath($destFile));
@@ -567,7 +575,7 @@ protected function _getUniqueFileName($file, $dirsep) {
                 );
         } else {
             $destFile = dirname($file) . $dirsep
-                . Varien_File_Uploader::getNewFileName($this->_getConfig()->getMediaPath($file));
+                . Mage_Core_Model_File_Uploader::getNewFileName($this->_getConfig()->getMediaPath($file));
         }
 
         return $destFile;
@@ -594,7 +602,8 @@ protected function _copyImage($file)
 
             if (Mage::helper('core/file_storage_database')->checkDbUsage()) {
                 Mage::helper('core/file_storage_database')
-                    ->copyFile($this->_getConfig()->getMediaShortUrl($file), $this->_getConfig()->getMediaShortUrl($destFile));
+                    ->copyFile($this->_getConfig()->getMediaShortUrl($file),
+                               $this->_getConfig()->getMediaShortUrl($destFile));
 
                 $ioObject->rm($this->_getConfig()->getMediaPath($destFile));
             } else {
@@ -605,9 +614,9 @@ protected function _copyImage($file)
             }
 
         } catch (Exception $e) {
+            $file = $this->_getConfig()->getMediaPath($file);
             Mage::throwException(
-                Mage::helper('catalog')->__('Failed to copy file %s. Please, delete media with non-existing images and try again.',
-                    $this->_getConfig()->getMediaPath($file))
+                Mage::helper('catalog')->__('Failed to copy file %s. Please, delete media with non-existing images and try again.', $file)
             );
         }
 
@@ -643,9 +652,9 @@ public function duplicate($object)
     protected function _getNotDuplicatedFilename($fileName, $dispretionPath)
     {
         $fileMediaName = $dispretionPath . DS
-                  . Varien_File_Uploader::getNewFileName($this->_getConfig()->getMediaPath($fileName));
+                  . Mage_Core_Model_File_Uploader::getNewFileName($this->_getConfig()->getMediaPath($fileName));
         $fileTmpMediaName = $dispretionPath . DS
-                  . Varien_File_Uploader::getNewFileName($this->_getConfig()->getTmpMediaPath($fileName));
+                  . Mage_Core_Model_File_Uploader::getNewFileName($this->_getConfig()->getTmpMediaPath($fileName));
 
         if ($fileMediaName != $fileTmpMediaName) {
             if ($fileMediaName != $fileName) {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php
index ee9ea5503e..068a69d0dd 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php
@@ -115,7 +115,7 @@ public function info($productId, $file, $store = null, $identifierType = null)
     public function create($productId, $data, $store = null, $identifierType = null)
     {
         $data = $this->_prepareImageData($data);
-        
+
         $product = $this->_initProduct($productId, $store, $identifierType);
 
         $gallery = $this->_getGalleryAttribute($product);
@@ -192,7 +192,7 @@ public function create($productId, $data, $store = null, $identifierType = null)
     public function update($productId, $file, $data, $store = null, $identifierType = null)
     {
         $data = $this->_prepareImageData($data);
-        
+
         $product = $this->_initProduct($productId, $store, $identifierType);
 
         $gallery = $this->_getGalleryAttribute($product);
@@ -200,7 +200,7 @@ public function update($productId, $file, $data, $store = null, $identifierType
         if (!$gallery->getBackend()->getImage($product, $file)) {
             $this->_fault('not_exists');
         }
-        
+
         if (isset($data['file']['mime']) && isset($data['file']['content'])) {
             if (!isset($this->_mimeTypes[$data['file']['mime']])) {
                 $this->_fault('data_invalid', Mage::helper('catalog')->__('Invalid image type.'));
@@ -327,7 +327,7 @@ protected function _prepareImageData($data)
     {
         return $data;
     }
-    
+
     /**
      * Retrieve gallery attribute from product
      *
@@ -390,30 +390,12 @@ protected function _imageToArray(&$image, $product)
      *
      * @param int|string $productId
      * @param string|int $store
+     * @param  string $identifierType
      * @return Mage_Catalog_Model_Product
      */
     protected function _initProduct($productId, $store = null, $identifierType = null)
     {
-        $loadByIdOnFalse = false;
-        if ($identifierType === null) {
-            $identifierType = 'sku';
-            $loadByIdOnFalse = true;
-        }
-        /* @var $product Mage_Catalog_Model_Product */
-        $product = Mage::getModel('catalog/product')
-                       ->setStoreId($this->_getStoreId($store));
-        if ($identifierType == 'sku') {
-            $idBySku = $product->getIdBySku($productId);
-            if ($idBySku) {
-                $productId = $idBySku;
-            }
-            if ($idBySku || $loadByIdOnFalse) {
-                $product->load($productId);
-            }
-        } elseif ($identifierType == 'id') {
-            $product->load($productId);
-        }
-
+        $product = Mage::helper('catalog/product')->getProduct($productId, $this->_getStoreId($store), $identifierType);
         if (!$product->getId()) {
             $this->_fault('product_not_exists');
         }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php
index 0f7601f593..d7d9d3bb9c 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php
@@ -54,7 +54,10 @@ public function info($productId, $identifierType = null)
         foreach ($tierPrices as $tierPrice) {
             $row = array();
             $row['customer_group_id'] = (empty($tierPrice['all_groups']) ? $tierPrice['cust_group'] : 'all' );
-            $row['website']           = ($tierPrice['website_id'] ? Mage::app()->getWebsite($tierPrice['website_id'])->getCode() : 'all');
+            $row['website']           = ($tierPrice['website_id'] ?
+                            Mage::app()->getWebsite($tierPrice['website_id'])->getCode() :
+                            'all'
+                    );
             $row['qty']               = $tierPrice['price_qty'];
             $row['price']             = $tierPrice['price'];
 
@@ -160,38 +163,18 @@ public function prepareTierPrices($product, $tierPrices = null)
 
         return $updateValue;
     }
-    
+
     /**
      * Retrieve product
      *
      * @param int $productId
      * @param string|int $store
+     * @param  string $identifierType
      * @return Mage_Catalog_Model_Product
      */
     protected function _initProduct($productId, $identifierType = null)
     {
-        $loadByIdOnFalse = false;
-        if ($identifierType === null) {
-            $identifierType = 'sku';
-            $loadByIdOnFalse = true;
-        }
-        $product = Mage::getModel('catalog/product')
-                       ->setStoreId($this->_getStoreId());
-
-        if ($identifierType == 'sku') {
-            $idBySku = $product->getIdBySku($productId);
-            if ($idBySku) {
-                $productId = $idBySku;
-            }
-            if ($idBySku || $loadByIdOnFalse) {
-                $product->load($productId);
-            }
-        } elseif ($identifierType == 'id') {
-            $product->load($productId);
-        }
-
-        /* @var $product Mage_Catalog_Model_Product */
-
+        $product = Mage::helper('catalog/product')->getProduct($productId, $this->_getStoreId($store), $identifierType);
         if (!$product->getId()) {
             $this->_fault('product_not_exists');
         }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Link/Api.php b/app/code/core/Mage/Catalog/Model/Product/Link/Api.php
index 21dfda856e..2b80c15b13 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Link/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Link/Api.php
@@ -261,29 +261,12 @@ protected function _getTypeId($type)
      * Initilize and return product model
      *
      * @param int $productId
+     * @param  string $identifierType
      * @return Mage_Catalog_Model_Product
      */
     protected function _initProduct($productId, $identifierType = null)
     {
-        $loadByIdOnFalse = false;
-        if ($identifierType === null) {
-            $identifierType = 'sku';
-            $loadByIdOnFalse = true;
-        }
-        $product = Mage::getModel('catalog/product')
-            ->setStoreId($this->_getStoreId());
-        if ($identifierType == 'sku') {
-            $idBySku = $product->getIdBySku($productId);
-            if ($idBySku) {
-                $productId = $idBySku;
-            }
-            if ($idBySku || $loadByIdOnFalse) {
-                $product->load($productId);
-            }
-        } elseif ($identifierType == 'id') {
-            $product->load($productId);
-        }
-
+        $product = Mage::helper('catalog/product')->getProduct($productId, null, $identifierType);
         if (!$product->getId()) {
             $this->_fault('product_not_exists');
         }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
index 83d6aec59e..569423514d 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
@@ -189,8 +189,9 @@ protected function _validateUploadedFile()
             // when file exceeds the upload_max_filesize, $_FILES is empty
             if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['CONTENT_LENGTH'] > $this->_getUploadMaxFilesize()) {
                 $this->setIsValid(false);
+                $value = $this->_bytesToMbytes($this->_getUploadMaxFilesize());
                 Mage::throwException(
-                    Mage::helper('catalog')->__("The file you uploaded is larger than %s Megabytes allowed by server", $this->_bytesToMbytes($this->_getUploadMaxFilesize()))
+                    Mage::helper('catalog')->__("The file you uploaded is larger than %s Megabytes allowed by server", $value)
                 );
             } else {
                 switch($this->getProcessMode())
@@ -248,8 +249,8 @@ protected function _validateUploadedFile()
 
             $extension = pathinfo(strtolower($fileInfo['name']), PATHINFO_EXTENSION);
 
-            $fileName = Varien_File_Uploader::getCorrectFileName($fileInfo['name']);
-            $dispersion = Varien_File_Uploader::getDispretionPath($fileName);
+            $fileName = Mage_Core_Model_File_Uploader::getCorrectFileName($fileInfo['name']);
+            $dispersion = Mage_Core_Model_File_Uploader::getDispretionPath($fileName);
 
             $filePath = $dispersion;
             $fileHash = md5(file_get_contents($fileInfo['tmp_name']));
@@ -316,8 +317,10 @@ protected function _validateFile($optionValue)
     {
         $option = $this->getOption();
         /**
-         * @see Mage_Catalog_Model_Product_Option_Type_File::_validateUploadFile() - there setUserValue() sets correct \n
-         * fileFullPath only for quote_path. So we must form both full paths manually and check them.
+         * @see Mage_Catalog_Model_Product_Option_Type_File::_validateUploadFile()
+         *              There setUserValue() sets correct fileFullPath only for
+         *              quote_path. So we must form both full paths manually and
+         *              check them.
          */
         $checkPaths = array();
         if (isset($optionValue['quote_path'])) {
@@ -409,15 +412,19 @@ protected function _getValidatorErrors($errors, $fileInfo)
         $result = array();
         foreach ($errors as $errorCode) {
             if ($errorCode == Zend_Validate_File_ExcludeExtension::FALSE_EXTENSION) {
-                $result[] = Mage::helper('catalog')->__("The file '%s' for '%s' has an invalid extension", $fileInfo['title'], $option->getTitle());
+                $result[] = Mage::helper('catalog')->__("The file '%s' for '%s' has an invalid extension",
+                    $fileInfo['title'], $option->getTitle());
             } elseif ($errorCode == Zend_Validate_File_Extension::FALSE_EXTENSION) {
-                $result[] = Mage::helper('catalog')->__("The file '%s' for '%s' has an invalid extension", $fileInfo['title'], $option->getTitle());
+                $result[] = Mage::helper('catalog')->__("The file '%s' for '%s' has an invalid extension",
+                    $fileInfo['title'], $option->getTitle());
             } elseif ($errorCode == Zend_Validate_File_ImageSize::WIDTH_TOO_BIG
                 || $errorCode == Zend_Validate_File_ImageSize::HEIGHT_TOO_BIG)
             {
-                $result[] = Mage::helper('catalog')->__("Maximum allowed image size for '%s' is %sx%s px.", $option->getTitle(), $option->getImageSizeX(), $option->getImageSizeY());
+                $result[] = Mage::helper('catalog')->__("Maximum allowed image size for '%s' is %sx%s px.",
+                    $option->getTitle(), $option->getImageSizeX(), $option->getImageSizeY());
             } elseif ($errorCode == Zend_Validate_File_FilesSize::TOO_BIG) {
-                $result[] = Mage::helper('catalog')->__("The file '%s' you uploaded is larger than %s Megabytes allowed by server", $fileInfo['title'], $this->_bytesToMbytes($this->_getUploadMaxFilesize()));
+                $result[] = Mage::helper('catalog')->__("The file '%s' you uploaded is larger than %s Megabytes allowed by server",
+                    $fileInfo['title'], $this->_bytesToMbytes($this->_getUploadMaxFilesize()));
             }
         }
         return $result;
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php
index d53220ae1c..f7be288758 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php
@@ -46,14 +46,20 @@ public function validateUserValue($values)
 
         $option = $this->getOption();
         $value = trim($this->getUserValue());
+
+        // Check requires option to have some value
         if (strlen($value) == 0 && $option->getIsRequire() && !$this->getSkipCheckRequiredOption()) {
             $this->setIsValid(false);
             Mage::throwException(Mage::helper('catalog')->__('Please specify the product\'s required option(s).'));
         }
-        if (strlen($value) > $option->getMaxCharacters() && $option->getMaxCharacters() > 0) {
+
+        // Check maximal length limit
+        $maxCharacters = $option->getMaxCharacters();
+        if ($maxCharacters > 0 && Mage::helper('core/string')->strlen($value) > $maxCharacters) {
             $this->setIsValid(false);
             Mage::throwException(Mage::helper('catalog')->__('The text is too long'));
         }
+
         $this->setUserValue($value);
         return $this;
     }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php
index 481ea519bb..3a87290a1b 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php
@@ -109,9 +109,18 @@ abstract class Mage_Catalog_Model_Product_Type_Abstract
 
     /**
      * Process modes
+     *
+     * Full validation - all required options must be set, whole configuration
+     * must be valid
+     */
+    const PROCESS_MODE_FULL = 'full';
+
+    /**
+     * Process modes
+     *
+     * Lite validation - only received options are validated
      */
-    const PROCESS_MODE_FULL = 'full'; // Full validation - all required options must be set, whole configuration must be valid
-    const PROCESS_MODE_LITE = 'lite'; // Lite validation - only received options are validated
+    const PROCESS_MODE_LITE = 'lite';
 
     /**
      * Specify type instance product
@@ -369,7 +378,8 @@ protected function _prepareProduct(Varien_Object $buyRequest, $product, $process
      * @param string $processMode
      * @return array|string
      */
-    public function processConfiguration(Varien_Object $buyRequest, $product = null, $processMode = self::PROCESS_MODE_LITE)
+    public function processConfiguration(Varien_Object $buyRequest, $product = null,
+        $processMode = self::PROCESS_MODE_LITE)
     {
         $_products = $this->_prepareProduct($buyRequest, $product, $processMode);
 
@@ -415,7 +425,7 @@ public function prepareForCart(Varien_Object $buyRequest, $product = null)
      */
     public function processFileQueue()
     {
-        if (empty ($this->_fileQueue)) {
+        if (empty($this->_fileQueue)) {
             return $this;
         }
 
@@ -425,6 +435,7 @@ public function processFileQueue()
                     case 'receive_uploaded_file':
                         $src = isset($queueOptions['src_name']) ? $queueOptions['src_name'] : '';
                         $dst = isset($queueOptions['dst_name']) ? $queueOptions['dst_name'] : '';
+                        /** @var $uploader Zend_File_Transfer_Adapter_Http */
                         $uploader = isset($queueOptions['uploader']) ? $queueOptions['uploader'] : null;
 
                         $path = dirname($dst);
@@ -464,7 +475,10 @@ public function processFileQueue()
 
     /**
      * Add file to File Queue
-     * @param array $queueOptions Array of File Queue (eg. ['operation'=>'move', 'src_name'=>'filename', 'dst_name'=>'filename2'])
+     * @param array $queueOptions   Array of File Queue
+     *                              (eg. ['operation'=>'move',
+     *                                    'src_name'=>'filename',
+     *                                    'dst_name'=>'filename2'])
      */
     public function addFileQueue($queueOptions)
     {
@@ -554,12 +568,14 @@ public function checkProductBuyState($product = null)
     {
         if (!$this->getProduct($product)->getSkipCheckRequiredOption()) {
             foreach ($this->getProduct($product)->getOptions() as $option) {
-                if ($option->getIsRequire() && (!$this->getProduct($product)->getCustomOption('option_'.$option->getId())
-                || strlen($this->getProduct($product)->getCustomOption('option_'.$option->getId())->getValue()) == 0)) {
-                    $this->getProduct($product)->setSkipCheckRequiredOption(true);
-                    Mage::throwException(
-                        Mage::helper('catalog')->__('The product has required options')
-                    );
+                if ($option->getIsRequire()) {
+                    $customOption = $this->getProduct($product)->getCustomOption('option_' . $option->getId());
+                    if (!$customOption || strlen($customOption->getValue()) == 0) {
+                        $this->getProduct($product)->setSkipCheckRequiredOption(true);
+                        Mage::throwException(
+                            Mage::helper('catalog')->__('The product has required options')
+                        );
+                    }
                 }
             }
         }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped/Price.php
new file mode 100644
index 0000000000..143280ab9a
--- /dev/null
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped/Price.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Grouped product price model
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Catalog_Model_Product_Type_Grouped_Price extends Mage_Catalog_Model_Product_Type_Price
+{
+    /**
+     * Returns product final price depending on options chosen
+     *
+     * @param   double $qty
+     * @param   Mage_Catalog_Model_Product $product
+     * @return  double
+     */
+    public function getFinalPrice($qty=null, $product)
+    {
+        if (is_null($qty) && !is_null($product->getCalculatedFinalPrice())) {
+            return $product->getCalculatedFinalPrice();
+        }
+
+        $finalPrice = parent::getFinalPrice($qty, $product);
+        if ($product->hasCustomOptions()) {
+            /* @var $typeInstance Mage_Catalog_Model_Product_Type_Grouped */
+            $typeInstance = $product->getTypeInstance(true);
+            $associatedProducts = $typeInstance->setStoreFilter($product->getStore(), $product)
+                ->getAssociatedProducts($product);
+            foreach ($associatedProducts as $childProduct) {
+                /* @var $childProduct Mage_Catalog_Model_Product */
+                $option = $product->getCustomOption('associated_product_' . $childProduct->getId());
+                if (!$option) {
+                    continue;
+                }
+                $childQty = $option->getValue();
+                if (!$childQty) {
+                    continue;
+                }
+                $finalPrice += $childProduct->getFinalPrice($childQty) * $childQty;
+            }
+        }
+
+        $product->setFinalPrice($finalPrice);
+        Mage::dispatchEvent('catalog_product_type_grouped_price', array('product' => $product));
+
+        return max(0, $product->getData('final_price'));
+    }
+}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php
index e431111832..4eaf0e6086 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php
@@ -164,7 +164,10 @@ protected function _setAttribteValue($object, $valueRow)
                     $object->setAttributeDefaultValue($attributeCode, $valueRow['value']);
                 }
                 else {
-                    $object->setAttributeDefaultValue($attributeCode, $this->_attributes[$valueRow['attribute_id']]['value']);
+                    $object->setAttributeDefaultValue(
+                        $attributeCode,
+                        $this->_attributes[$valueRow['attribute_id']]['value']
+                    );
                 }
             }
             else {
@@ -266,7 +269,7 @@ protected function _insertAttribute($object, $attribute, $value)
                 'entity_id'         => $object->getEntityId(),
                 'value'             => $this->_prepareValueForSave($value, $attribute)
             );
-            $this->_getWriteAdapter()->insertOnDuplicate($attribute->getBackend()->getTable(), $bind, array('value'));
+            $this->_getWriteAdapter()->select()->insertIgnoreFromSelect($attribute->getBackend()->getTable(), $bind);
         }
         return $this->_saveAttributeValue($object, $attribute, $value);
 
@@ -330,7 +333,10 @@ protected function _updateAttribute($object, $attribute, $valueId, $value)
 //                $attribute->getBackend()->getTable(),
 //                $this->_getWriteAdapter()->quoteInto('attribute_id=?', $attribute->getId()) .
 //                $this->_getWriteAdapter()->quoteInto(' AND entity_id=?', $object->getId()) .
-//                $this->_getWriteAdapter()->quoteInto(' AND store_id!=?', Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID)
+//                $this->_getWriteAdapter()->quoteInto(
+//                    ' AND store_id!=?',
+//                    Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID
+//                )
 //            );
 //        }
 //
@@ -558,7 +564,10 @@ protected function _isAttributeValueEmpty(Mage_Eav_Model_Entity_Attribute_Abstra
      * @param array $origData
      * @return bool
      */
-    protected function _canUpdateAttribute(Mage_Eav_Model_Entity_Attribute_Abstract $attribute, $value, array &$origData)
+    protected function _canUpdateAttribute(
+        Mage_Eav_Model_Entity_Attribute_Abstract $attribute,
+        $value,
+        array &$origData)
     {
         $result = parent::_canUpdateAttribute($attribute, $value, $origData);
         if ($result &&
@@ -658,14 +667,23 @@ public function getAttributeRawValue($entityId, $attribute, $store)
                     ->where('default_value.entity_id = ? ', $entityId)
                     ->where('default_value.store_id = 0');
 
-                $joinCondition = $this->_getReadAdapter()->quoteInto('store_value.attribute_id IN (?)', array_keys($_attributes));
-                $joinCondition .= ' AND ' . $this->_getReadAdapter()->quoteInto('store_value.entity_type_id = ?', $this->getTypeId());
+                $joinCondition = $this->_getReadAdapter()->quoteInto(
+                    'store_value.attribute_id IN (?)',
+                    array_keys($_attributes)
+                );
+                $joinCondition .= ' AND ' . $this->_getReadAdapter()->quoteInto(
+                    'store_value.entity_type_id = ?',
+                    $this->getTypeId()
+                );
                 $joinCondition .= ' AND ' . $this->_getReadAdapter()->quoteInto('store_value.entity_id = ?', $entityId);
                 $joinCondition .= ' AND ' . $this->_getReadAdapter()->quoteInto('store_value.store_id = ?', $store);
 
                 $select->joinLeft(array('store_value' => $table),
                     $joinCondition,
-                    array('attr_value' => 'IFNULL(store_value.value, default_value.value)', 'default_value.attribute_id')
+                    array(
+                        'attr_value' => 'IFNULL(store_value.value, default_value.value)',
+                        'default_value.attribute_id'
+                    )
                 );
                 $result = $this->_getReadAdapter()->fetchAll($select);
                 foreach ($result as $key => $_attribute) {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php
index 940aaf4e99..b1a89d8d7c 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php
@@ -142,11 +142,12 @@ protected function _joinAttributeToSelect($method, $attribute, $tableAlias, $con
     {
         if (isset($this->_joinAttributes[$fieldCode]['store_id'])) {
             $store_id = $this->_joinAttributes[$fieldCode]['store_id'];
-        }
-        else {
+        } else {
             $store_id = $this->getStoreId();
         }
 
+        $adapter = $this->getConnection();
+
         if ($store_id != $this->getDefaultStoreId() && !$attribute->isScopeGlobal()) {
             /**
              * Add joining default value for not default store
@@ -158,7 +159,9 @@ protected function _joinAttributeToSelect($method, $attribute, $tableAlias, $con
             $defFieldAlias= str_replace($tableAlias, $defAlias, $fieldAlias);
 
             $defCondition = str_replace($tableAlias, $defAlias, $defCondition);
-            $defCondition.= $this->getConnection()->quoteInto(" AND $defAlias.store_id=?", $this->getDefaultStoreId());
+            $defCondition.= $adapter->quoteInto(
+                " AND " . $adapter->quoteColumnAs("$defAlias.store_id", null) . " = ?",
+                $this->getDefaultStoreId());
 
             $this->getSelect()->$method(
                 array($defAlias => $attribute->getBackend()->getTable()),
@@ -167,14 +170,15 @@ protected function _joinAttributeToSelect($method, $attribute, $tableAlias, $con
             );
 
             $method = 'joinLeft';
-            $fieldAlias = new Zend_Db_Expr("IF($tableAlias.value_id>0, $fieldAlias, $defFieldAlias)");
+            $fieldAlias = new Zend_Db_Expr("IF($tableAlias.value_id > 0, $fieldAlias, $defFieldAlias)");
             $this->_joinAttributes[$fieldCode]['condition_alias'] = $fieldAlias;
             $this->_joinAttributes[$fieldCode]['attribute']       = $attribute;
-        }
-        else {
+        } else {
             $store_id = $this->getDefaultStoreId();
         }
-        $condition[] = $this->getConnection()->quoteInto("$tableAlias.store_id=?", $store_id);
+
+        $condition[] = $adapter->quoteInto(
+            $adapter->quoteColumnAs("$tableAlias.store_id", null) . ' = ?', $store_id);
         return parent::_joinAttributeToSelect($method, $attribute, $tableAlias, $condition, $fieldCode, $fieldAlias);
     }
 }
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php
index 92525f385a..4ea949a5e2 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php
@@ -62,17 +62,39 @@ protected function _getDefaultAttributes()
     /**
      * Retrieve product website identifiers
      *
-     * @param   $product
+     * @param   Mage_Catalog_Model_Product|int $product
      * @return  Mage_Catalog_Model_Resource_Eav_Mysql4_Product
      */
     public function getWebsiteIds($product)
     {
+        if ($product instanceof Mage_Catalog_Model_Product) {
+            $productId = $product->getId();
+        } else {
+            $productId = $product;
+        }
+
         $select = $this->_getWriteAdapter()->select()
             ->from($this->_productWebsiteTable, 'website_id')
-            ->where('product_id=?', $product->getId());
+            ->where('product_id = ?', $productId);
         return $this->_getWriteAdapter()->fetchCol($select);
     }
 
+    /**
+     * Retrieve product website identifiers by product identifiers
+     *
+     * @param   array $productIds
+     * @return  array
+     */
+    public function getWebsiteIdsByProductIds($productIds)
+    {
+        $select = $this->_getWriteAdapter()->select()
+            ->from($this->_productWebsiteTable, array('product_id', 'website_ids' =>'GROUP_CONCAT(website_id)'))
+            ->where('product_id IN (?)', $productIds)
+            ->group('product_id');
+
+        return $this->_getWriteAdapter()->fetchAll($select);
+    }
+
     /**
      * Retrieve product category identifiers
      *
@@ -95,7 +117,7 @@ public function getCategoryIds($product)
      */
     public function getIdBySku($sku)
     {
-         return $this->_getReadAdapter()->fetchOne('select entity_id from '.$this->getEntityTable().' where sku=?', $sku);
+        return $this->_getReadAdapter()->fetchOne('select entity_id from '.$this->getEntityTable().' where sku=?',$sku);
     }
 
     /**
@@ -367,7 +389,8 @@ public function refreshEnabledIndex($store=null, $product=null)
             WHERE
                 t_v_default.attribute_id='{$visibilityAttributeId}'
                 AND t_v_default.store_id=0{$productsCondition}
-                AND (IF(t_s.value_id>0, t_s.value, t_s_default.value)=".Mage_Catalog_Model_Product_Status::STATUS_ENABLED.")";
+                AND (IF(t_s.value_id>0, t_s.value, t_s_default.value) =
+                ".Mage_Catalog_Model_Product_Status::STATUS_ENABLED.")";
             $this->_getWriteAdapter()->query($query);
         }
         elseif (is_null($store)) {
@@ -400,7 +423,8 @@ public function refreshEnabledIndex($store=null, $product=null)
             WHERE
                 t_v_default.entity_id={$productId}
                 AND t_v_default.attribute_id='{$visibilityAttributeId}' AND t_v_default.store_id=0
-                AND (IF(t_s.value_id>0, t_s.value, t_s_default.value)=".Mage_Catalog_Model_Product_Status::STATUS_ENABLED.")";
+                AND (IF(t_s.value_id>0, t_s.value, t_s_default.value) =
+                ".Mage_Catalog_Model_Product_Status::STATUS_ENABLED.")";
             $this->_getWriteAdapter()->query($query);
         }
 
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php
index 66b16ed1d5..71d6ab3530 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php
@@ -32,7 +32,8 @@
  * @author      Magento Core Team <core@magentocommerce.com>
 
  */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract
+class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Image
+    extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract
 {
     public function afterSave($object)
     {
@@ -46,7 +47,7 @@ public function afterSave($object)
         }
 
         try {
-            $uploader = new Varien_File_Uploader($this->getAttribute()->getName());
+            $uploader = new Mage_Core_Model_File_Uploader($this->getAttribute()->getName());
             $uploader->setAllowedExtensions(array('jpg','jpeg','gif','png'));
             $uploader->setAllowRenameFiles(true);
             $uploader->setFilesDispersion(true);
@@ -54,7 +55,7 @@ public function afterSave($object)
         catch (Exception $e){
             return $this;
         }
-        $uploader->save(Mage::getStoreConfig('system/filesystem/media').'/catalog/product');
+        $uploader->save(Mage::getStoreConfig('system/filesystem/media') . '/catalog/product');
 
         if ($fileName = $uploader->getUploadedFileName()) {
             $object->setData($this->getAttribute()->getName(), $fileName);
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php
index c9ba7b7f61..457986df47 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php
@@ -113,7 +113,7 @@ class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection
      *
      * @var array
      */
-    protected $_productLimitationFilters    = array();
+    protected $_productLimitationFilters = array();
 
     /**
      * Category product count select
@@ -548,20 +548,23 @@ public function addWebsiteFilter($websites = null)
     /**
      * Specify category filter for product collection
      *
-     * @param Mage_Catalog_Model_Category $category
-     * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection
+     * @param   Mage_Catalog_Model_Category $category
+     * @return  Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection
      */
     public function addCategoryFilter(Mage_Catalog_Model_Category $category)
     {
         $this->_productLimitationFilters['category_id'] = $category->getId();
         if ($category->getIsAnchor()) {
             unset($this->_productLimitationFilters['category_is_anchor']);
-        }
-        else {
+        } else {
             $this->_productLimitationFilters['category_is_anchor'] = 1;
         }
 
-        ($this->getStoreId() == 0)? $this->_applyZeroStoreProductLimitations() : $this->_applyProductLimitations();
+        if ($this->getStoreId() == Mage_Core_Model_App::ADMIN_STORE_ID) {
+            $this->_applyZeroStoreProductLimitations();
+        } else {
+            $this->_applyProductLimitations();
+        }
 
         return $this;
     }
@@ -777,7 +780,10 @@ public function getProductCountSelect()
                 ->distinct(false)
                 ->join(array('count_table' => $this->getTable('catalog/category_product_index')),
                     'count_table.product_id = e.entity_id',
-                    array('count_table.category_id', 'product_count' => new Zend_Db_Expr('COUNT(DISTINCT count_table.product_id)'))
+                    array(
+                        'count_table.category_id',
+                        'product_count' => new Zend_Db_Expr('COUNT(DISTINCT count_table.product_id)')
+                    )
                 )
                 ->where('count_table.store_id = ?', $this->getStoreId())
                 ->group('count_table.category_id');
@@ -818,7 +824,10 @@ public function addCountToCategories($categoryCollection)
         if ($isAnchor || $isNotAnchor) {
             $select = $this->getProductCountSelect();
 
-            Mage::dispatchEvent('catalog_product_collection_before_add_count_to_categories', array('collection'=>$this));
+            Mage::dispatchEvent(
+                'catalog_product_collection_before_add_count_to_categories',
+                array('collection' => $this)
+            );
 
             if ($isAnchor) {
                 $anchorStmt = clone $select;
@@ -1536,12 +1545,14 @@ protected function _productLimitationJoinPrice()
         $fromPart = $this->getSelect()->getPart(Zend_Db_Select::FROM);
         if (!isset($fromPart['price_index'])) {
             $minimalExpr = new Zend_Db_Expr(
-                'IF(`price_index`.`tier_price`, LEAST(`price_index`.`min_price`, `price_index`.`tier_price`), `price_index`.`min_price`)'
+                'IF(`price_index`.`tier_price`, LEAST(`price_index`.`min_price`, `price_index`.`tier_price`), ' .
+                '`price_index`.`min_price`)'
             );
             $this->getSelect()->join(
                 array('price_index' => $this->getTable('catalog/product_index_price')),
                 $joinCond,
-                array('price', 'tax_class_id', 'final_price', 'minimal_price'=>$minimalExpr , 'min_price', 'max_price', 'tier_price')
+                array('price', 'tax_class_id', 'final_price', 'minimal_price' => $minimalExpr ,'min_price', 'max_price',
+                    'tier_price')
             );
 
             // Set additional field filters
@@ -1566,10 +1577,12 @@ public function applyFrontendPriceLimitations()
     {
         $this->_productLimitationFilters['use_price_index'] = true;
         if (!isset($this->_productLimitationFilters['customer_group_id'])) {
-            $this->_productLimitationFilters['customer_group_id'] = Mage::getSingleton('customer/session')->getCustomerGroupId();
+            $customerGroupId = Mage::getSingleton('customer/session')->getCustomerGroupId();
+            $this->_productLimitationFilters['customer_group_id'] = $customerGroupId;
         }
         if (!isset($this->_productLimitationFilters['website_id'])) {
-            $this->_productLimitationFilters['website_id'] = Mage::app()->getStore($this->getStoreId())->getWebsiteId();
+            $websiteId = Mage::app()->getStore($this->getStoreId())->getWebsiteId();
+            $this->_productLimitationFilters['website_id'] = $websiteId;
         }
         $this->_applyProductLimitations();
         return $this;
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php
index e88b10c7e1..b15fac9aff 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php
@@ -126,13 +126,15 @@ public function joinAttributes()
     {
         if ($this->getLinkModel()) {
             $attributes = $this->getLinkModel()->getAttributes();
-            $attributesByType = array();
+            $adapter = $this->getConnection();
             foreach ($attributes as $attribute) {
                 $table = $this->getLinkModel()->getAttributeTypeTable($attribute['type']);
-                $alias = 'link_attribute_'.$attribute['code'].'_'.$attribute['type'];
+                $alias = 'link_attribute_' . $attribute['code'] . '_' . $attribute['type'];
+                $aliasInCondition = $adapter->quoteColumnAs($alias, null);
                 $this->getSelect()->joinLeft(
                     array($alias => $table),
-                    $alias.'.link_id=main_table.link_id AND '.$alias.'.product_link_attribute_id='.$attribute['id'],
+                    $aliasInCondition . '.link_id = main_table.link_id AND '
+                        . $aliasInCondition . '.product_link_attribute_id = ' . (int) $attribute['id'],
                     array($attribute['code'] => 'value')
                 );
             }
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php
index e5f595e1f4..7274798275 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php
@@ -161,7 +161,8 @@ public function savePrices($attribute)
                 $old[$key] = $row;
             } else {
                 // delete invalid (duplicate row)
-                $write->delete($this->_priceTable, array('value_id' => $row['value_id']));
+                $where = $write->quoteInto('value_id=?', $row['value_id']);
+                $write->delete($this->_priceTable, $where);
             }
         }
 
diff --git a/app/code/core/Mage/Catalog/Model/Url.php b/app/code/core/Mage/Catalog/Model/Url.php
index 0aaf55d567..93d0ce8597 100644
--- a/app/code/core/Mage/Catalog/Model/Url.php
+++ b/app/code/core/Mage/Catalog/Model/Url.php
@@ -126,7 +126,8 @@ protected function _addCategoryUrlPath($category)
             return;
         }
 
-        // This routine is not intended to be used with root categories, but handle 'em gracefully - ensure them to have empty path.
+        // This routine is not intended to be used with root categories,
+        // but handle 'em gracefully - ensure them to have empty path.
         if ($category->getLevel() <= 1) {
             $category->setUrlPath('');
             return;
@@ -406,10 +407,15 @@ protected function _refreshCategoryProductRewrites(Varien_Object $category)
             // Prepare rewrites for generation
             $rootCategory = $this->getStoreRootCategory($category->getStoreId());
             $categoryIds = array($category->getId(), $rootCategory->getId());
-            $this->_rewrites = $this->getResource()->prepareRewrites($category->getStoreId(), $categoryIds, array_keys($products));
+            $this->_rewrites = $this->getResource()->prepareRewrites(
+                $category->getStoreId(),
+                $categoryIds,
+                array_keys($products)
+            );
 
             foreach ($products as $product) {
-                $this->_refreshProductRewrite($product, $rootCategory); // Product always must have rewrite in root category
+                // Product always must have rewrite in root category
+                $this->_refreshProductRewrite($product, $rootCategory);
                 $this->_refreshProductRewrite($product, $category);
             }
             $firstIteration = false;
@@ -478,27 +484,25 @@ public function refreshProductRewrite($productId, $storeId = null)
         if ($product) {
             $store = $this->getStores($storeId);
             $storeRootCategoryId = $store->getRootCategoryId();
-            $storeRootCategoryPath = $store->getRootCategoryPath();
-            $categories = $this->getResource()->getCategories($product->getCategoryIds(), $storeId); // List of categories the product is assigned to, filtered by being within the store's categories root
+
+            // List of categories the product is assigned to, filtered by being within the store's categories root
+            $categories = $this->getResource()->getCategories($product->getCategoryIds(), $storeId);
             $this->_rewrites = $this->getResource()->prepareRewrites($storeId, '', $productId);
 
             // Add rewrites for all needed categories
-            if ($categories) {
-                // If product is assigned to any of store's categories - we also should use store root category to create root product url rewrite
-                if (!isset($categories[$storeRootCategoryId])) {
-                    $categories[$storeRootCategoryId] = $this->getResource()->getCategory($storeRootCategoryId, $storeId);
-                }
+            // If product is assigned to any of store's categories -
+            // we also should use store root category to create root product url rewrite
+            if (!isset($categories[$storeRootCategoryId])) {
+                $categories[$storeRootCategoryId] = $this->getResource()->getCategory($storeRootCategoryId, $storeId);
+            }
 
-                // Create product url rewrites
-                foreach ($categories as $category) {
-                    $this->_refreshProductRewrite($product, $category);
-                }
+            // Create product url rewrites
+            foreach ($categories as $category) {
+                $this->_refreshProductRewrite($product, $category);
             }
 
-            // Remove all other product rewrites created earlier for this store - they're invalid now.
-            // Always leave root categroy, as far as product is found it means that it's assigned to store's website,
-            // so this product must have root url rewrite
-            $excludeCategoryIds = $categories ? array_keys($categories) : array($storeRootCategoryId);
+            // Remove all other product rewrites created earlier for this store - they're invalid now
+            $excludeCategoryIds = array_keys($categories);
             $this->getResource()->clearProductRewrites($productId, $storeId, $excludeCategoryIds);
 
             unset($categories);
@@ -692,8 +696,10 @@ public function getProductRequestPath($product, $category)
          * Prepare product base request path
          */
         if ($category->getLevel() > 1) {
-            $this->_addCategoryUrlPath($category); // To ensure, that category has path either from attribute or generated now
-            $categoryUrl = Mage::helper('catalog/category')->getCategoryUrlPath($category->getUrlPath(), false, $storeId);
+            // To ensure, that category has path either from attribute or generated now
+            $this->_addCategoryUrlPath($category);
+            $categoryUrl = Mage::helper('catalog/category')->getCategoryUrlPath($category->getUrlPath(),
+                false, $storeId);
             $requestPath = $categoryUrl . '/' . $urlKey;
         } else {
             $requestPath = $urlKey;
@@ -718,7 +724,9 @@ public function getProductRequestPath($product, $category)
             /**
              * Check if existing request past can be used
              */
-            if ($product->getUrlKey() == '' && !empty($requestPath) && strpos($existingRequestPath, $requestPath) !== false) {
+            if ($product->getUrlKey() == '' && !empty($requestPath)
+                && strpos($existingRequestPath, $requestPath) !== false
+            ) {
                 $existingRequestPath = str_replace($requestPath, '', $existingRequestPath);
                 if (preg_match('#^-([0-9]+)$#i', $existingRequestPath)) {
                     return $this->_rewrites[$idPath]->getRequestPath();
@@ -800,7 +808,8 @@ public function generatePath($type = 'target', $product = null, $category = null
                 elseif ($parentPath == '/') {
                     $parentPath = '';
                 }
-                $parentPath = Mage::helper('catalog/category')->getCategoryUrlPath($parentPath, true, $category->getStoreId());
+                $parentPath = Mage::helper('catalog/category')->getCategoryUrlPath($parentPath,
+                    true, $category->getStoreId());
 
                 return $this->getUnusedPath($category->getStoreId(), $parentPath . $urlKey . $categoryUrlSuffix,
                     $this->generatePath('id', null, $category)
@@ -820,8 +829,10 @@ public function generatePath($type = 'target', $product = null, $category = null
             }
             $productUrlSuffix  = $this->getProductUrlSuffix($category->getStoreId());
             if ($category->getLevel() > 1) {
-                $this->_addCategoryUrlPath($category); // To ensure, that category has url path either from attribute or generated now
-                $categoryUrl = Mage::helper('catalog/category')->getCategoryUrlPath($category->getUrlPath(), false, $category->getStoreId());
+                // To ensure, that category has url path either from attribute or generated now
+                $this->_addCategoryUrlPath($category);
+                $categoryUrl = Mage::helper('catalog/category')->getCategoryUrlPath($category->getUrlPath(),
+                    false, $category->getStoreId());
                 return $this->getUnusedPath($category->getStoreId(), $categoryUrl . '/' . $urlKey . $productUrlSuffix,
                     $this->generatePath('id', $product, $category)
                 );
diff --git a/app/code/core/Mage/Catalog/controllers/CategoryController.php b/app/code/core/Mage/Catalog/controllers/CategoryController.php
index c3c7fe1c53..336f85565e 100644
--- a/app/code/core/Mage/Catalog/controllers/CategoryController.php
+++ b/app/code/core/Mage/Catalog/controllers/CategoryController.php
@@ -56,7 +56,13 @@ protected function _initCatagory()
         Mage::getSingleton('catalog/session')->setLastVisitedCategoryId($category->getId());
         Mage::register('current_category', $category);
         try {
-            Mage::dispatchEvent('catalog_controller_category_init_after', array('category' => $category, 'controller_action' => $this));
+            Mage::dispatchEvent(
+                'catalog_controller_category_init_after',
+                array(
+                    'category' => $category,
+                    'controller_action' => $this
+                )
+            );
         } catch (Mage_Core_Exception $e) {
             Mage::logException($e);
             return false;
@@ -88,7 +94,8 @@ protected function _applyCustomDesignSettings($category, $update)
 
         if (array_key_exists('from', $validityDate) &&
             array_key_exists('to', $validityDate) &&
-            Mage::app()->getLocale()->isStoreDateInInterval(null, $validityDate['from'], $validityDate['to'])) {
+            Mage::app()->getLocale()->isStoreDateInInterval(null, $validityDate['from'], $validityDate['to'])
+        ) {
             if ($category->getPageLayout()) {
                 $this->getLayout()->helper('page/layout')
                     ->applyHandle($category->getPageLayout());
diff --git a/app/code/core/Mage/Catalog/controllers/ProductController.php b/app/code/core/Mage/Catalog/controllers/ProductController.php
index 0db0a0e82b..6ae39275da 100644
--- a/app/code/core/Mage/Catalog/controllers/ProductController.php
+++ b/app/code/core/Mage/Catalog/controllers/ProductController.php
@@ -163,14 +163,18 @@ public function galleryAction()
 
     /**
      * Display product image action
+     *
+     * @deprecated
      */
     public function imageAction()
     {
         $size = (string) $this->getRequest()->getParam('size');
         if ($size) {
-            $imageFile = preg_replace("#.*/catalog/product/image/size/[0-9]*x[0-9]*#", '', $this->getRequest()->getRequestUri());
+            $imageFile = preg_replace("#.*/catalog/product/image/size/[0-9]*x[0-9]*#", '',
+                $this->getRequest()->getRequestUri());
         } else {
-            $imageFile = preg_replace("#.*/catalog/product/image#", '', $this->getRequest()->getRequestUri());
+            $imageFile = preg_replace("#.*/catalog/product/image#", '',
+                $this->getRequest()->getRequestUri());
         }
 
         if (!strstr($imageFile, '.')) {
@@ -182,7 +186,10 @@ public function imageAction()
             $imageModel = Mage::getModel('catalog/product_image');
             $imageModel->setSize($size)
                 ->setBaseFile($imageFile)
-                ->resize()
+                /**
+                 * Resizing has been commented because this one method are deprecated
+                 */
+                //->resize()
                 ->setWatermark( Mage::getStoreConfig('catalog/watermark/image') )
                 ->saveFile()
                 ->push();
diff --git a/app/code/core/Mage/Catalog/etc/config.xml b/app/code/core/Mage/Catalog/etc/config.xml
index 0491f82419..63909c43fa 100644
--- a/app/code/core/Mage/Catalog/etc/config.xml
+++ b/app/code/core/Mage/Catalog/etc/config.xml
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Mage_Catalog>
-            <version>1.4.0.0.43</version>
+            <version>1.4.0.0.44</version>
         </Mage_Catalog>
     </modules>
 
@@ -442,6 +442,7 @@
                     <grouped translate="label" module="catalog">
                         <label>Grouped Product</label>
                         <model>catalog/product_type_grouped</model>
+                        <price_model>catalog/product_type_grouped_price</price_model>
                         <composite>1</composite>
                         <allow_product_types>
                             <simple/>
@@ -754,6 +755,14 @@
             </layer>
 -->
         </catalog>
+        <system>
+            <media_storage_configuration>
+                <allowed_resources>
+                    <catalog_images_folder>catalog</catalog_images_folder>
+                    <product_custom_options_fodler>custom_options</product_custom_options_fodler>
+                </allowed_resources>
+            </media_storage_configuration>
+        </system>
     </default>
 
     <crontab>
diff --git a/app/code/core/Mage/Catalog/etc/wsdl.xml b/app/code/core/Mage/Catalog/etc/wsdl.xml
index edde80dc7d..a324953c9e 100644
--- a/app/code/core/Mage/Catalog/etc/wsdl.xml
+++ b/app/code/core/Mage/Catalog/etc/wsdl.xml
@@ -1,1345 +1,1437 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns:typens="urn:{{var wsdl.name}}" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/"
-    name="{{var wsdl.name}}" targetNamespace="urn:{{var wsdl.name}}">
+<definitions xmlns:typens="urn:{{var wsdl.name}}" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+             xmlns="http://schemas.xmlsoap.org/wsdl/"
+             name="{{var wsdl.name}}" targetNamespace="urn:{{var wsdl.name}}">
     <types>
         <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:Magento">
-            <import namespace="http://schemas.xmlsoap.org/soap/encoding/" schemaLocation="http://schemas.xmlsoap.org/soap/encoding/" />
+            <import namespace="http://schemas.xmlsoap.org/soap/encoding/"
+                    schemaLocation="http://schemas.xmlsoap.org/soap/encoding/"/>
             <complexType name="catalogProductEntityArray">
                 <complexContent>
                     <restriction base="soapenc:Array">
-                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogProductEntity[]" />
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogProductEntity[]"/>
                     </restriction>
                 </complexContent>
             </complexType>
             <complexType name="catalogProductEntity">
                 <all>
-                    <element name="product_id" type="xsd:string" />
-                    <element name="sku" type="xsd:string" />
-                    <element name="name" type="xsd:string" />
-                    <element name="set" type="xsd:string" />
-                    <element name="type" type="xsd:string" />
-                    <element name="category_ids" type="typens:ArrayOfString" />
-                    <element name="website_ids" type="typens:ArrayOfString" />
+                    <element name="product_id" type="xsd:string"/>
+                    <element name="sku" type="xsd:string"/>
+                    <element name="name" type="xsd:string"/>
+                    <element name="set" type="xsd:string"/>
+                    <element name="type" type="xsd:string"/>
+                    <element name="category_ids" type="typens:ArrayOfString"/>
+                    <element name="website_ids" type="typens:ArrayOfString"/>
                 </all>
             </complexType>
             <complexType name="catalogProductRequestAttributes">
                 <all>
-                    <element name="attributes" type="typens:ArrayOfString" minOccurs="0" />
-                    <element name="additional_attributes" type="typens:ArrayOfString" minOccurs="0" />
+                    <element name="attributes" type="typens:ArrayOfString" minOccurs="0"/>
+                    <element name="additional_attributes" type="typens:ArrayOfString" minOccurs="0"/>
                 </all>
             </complexType>
             <complexType name="catalogProductReturnEntity">
                 <all>
-                    <element name="product_id" type="xsd:string" minOccurs="0" />
-                    <element name="sku" type="xsd:string" minOccurs="0" />
-                    <element name="set" type="xsd:string" minOccurs="0" />
-                    <element name="type" type="xsd:string" minOccurs="0" />
-                    <element name="categories" type="typens:ArrayOfString" minOccurs="0" />
-                    <element name="websites" type="typens:ArrayOfString" minOccurs="0" />
-                    <element name="created_at" type="xsd:string" minOccurs="0" />
-                    <element name="updated_at" type="xsd:string" minOccurs="0" />
-                    <element name="type_id" type="xsd:string" minOccurs="0" />
-                    <element name="name" type="xsd:string" minOccurs="0" />
-                    <element name="description" type="xsd:string" minOccurs="0" />
-                    <element name="short_description" type="xsd:string" minOccurs="0" />
-                    <element name="weight" type="xsd:string" minOccurs="0" />
-                    <element name="status" type="xsd:string" minOccurs="0" />
-                    <element name="url_key" type="xsd:string" minOccurs="0" />
-                    <element name="url_path" type="xsd:string" minOccurs="0" />
-                    <element name="visibility" type="xsd:string" minOccurs="0" />
-                    <element name="category_ids" type="typens:ArrayOfString" minOccurs="0" />
-                    <element name="website_ids" type="typens:ArrayOfString" minOccurs="0" />
-                    <element name="has_options" type="xsd:string" minOccurs="0" />
-                    <element name="gift_message_available" type="xsd:string" minOccurs="0" />
-                    <element name="price" type="xsd:string" minOccurs="0" />
-                    <element name="special_price" type="xsd:string" minOccurs="0" />
-                    <element name="special_from_date" type="xsd:string" minOccurs="0" />
-                    <element name="special_to_date" type="xsd:string" minOccurs="0" />
-                    <element name="tax_class_id" type="xsd:string" minOccurs="0" />
-                    <element name="tier_price" type="typens:catalogProductTierPriceEntityArray" minOccurs="0" />
-                    <element name="meta_title" type="xsd:string" minOccurs="0" />
-                    <element name="meta_keyword" type="xsd:string" minOccurs="0" />
-                    <element name="meta_description" type="xsd:string" minOccurs="0" />
-                    <element name="custom_design" type="xsd:string" minOccurs="0" />
-                    <element name="custom_layout_update" type="xsd:string" minOccurs="0" />
-                    <element name="options_container" type="xsd:string" minOccurs="0" />
-                    <element name="additional_attributes" type="typens:associativeArray" minOccurs="0" />
+                    <element name="product_id" type="xsd:string" minOccurs="0"/>
+                    <element name="sku" type="xsd:string" minOccurs="0"/>
+                    <element name="set" type="xsd:string" minOccurs="0"/>
+                    <element name="type" type="xsd:string" minOccurs="0"/>
+                    <element name="categories" type="typens:ArrayOfString" minOccurs="0"/>
+                    <element name="websites" type="typens:ArrayOfString" minOccurs="0"/>
+                    <element name="created_at" type="xsd:string" minOccurs="0"/>
+                    <element name="updated_at" type="xsd:string" minOccurs="0"/>
+                    <element name="type_id" type="xsd:string" minOccurs="0"/>
+                    <element name="name" type="xsd:string" minOccurs="0"/>
+                    <element name="description" type="xsd:string" minOccurs="0"/>
+                    <element name="short_description" type="xsd:string" minOccurs="0"/>
+                    <element name="weight" type="xsd:string" minOccurs="0"/>
+                    <element name="status" type="xsd:string" minOccurs="0"/>
+                    <element name="url_key" type="xsd:string" minOccurs="0"/>
+                    <element name="url_path" type="xsd:string" minOccurs="0"/>
+                    <element name="visibility" type="xsd:string" minOccurs="0"/>
+                    <element name="category_ids" type="typens:ArrayOfString" minOccurs="0"/>
+                    <element name="website_ids" type="typens:ArrayOfString" minOccurs="0"/>
+                    <element name="has_options" type="xsd:string" minOccurs="0"/>
+                    <element name="gift_message_available" type="xsd:string" minOccurs="0"/>
+                    <element name="price" type="xsd:string" minOccurs="0"/>
+                    <element name="special_price" type="xsd:string" minOccurs="0"/>
+                    <element name="special_from_date" type="xsd:string" minOccurs="0"/>
+                    <element name="special_to_date" type="xsd:string" minOccurs="0"/>
+                    <element name="tax_class_id" type="xsd:string" minOccurs="0"/>
+                    <element name="tier_price" type="typens:catalogProductTierPriceEntityArray" minOccurs="0"/>
+                    <element name="meta_title" type="xsd:string" minOccurs="0"/>
+                    <element name="meta_keyword" type="xsd:string" minOccurs="0"/>
+                    <element name="meta_description" type="xsd:string" minOccurs="0"/>
+                    <element name="custom_design" type="xsd:string" minOccurs="0"/>
+                    <element name="custom_layout_update" type="xsd:string" minOccurs="0"/>
+                    <element name="options_container" type="xsd:string" minOccurs="0"/>
+                    <element name="additional_attributes" type="typens:associativeArray" minOccurs="0"/>
                 </all>
             </complexType>
             <complexType name="catalogProductCreateEntity">
                 <all>
-                    <element name="categories" type="typens:ArrayOfString" minOccurs="0" />
-                    <element name="websites" type="typens:ArrayOfString" minOccurs="0" />
-                    <element name="name" type="xsd:string" minOccurs="0" />
-                    <element name="description" type="xsd:string" minOccurs="0" />
-                    <element name="short_description" type="xsd:string" minOccurs="0" />
-                    <element name="weight" type="xsd:string" minOccurs="0" />
-                    <element name="status" type="xsd:string" minOccurs="0" />
-                    <element name="url_key" type="xsd:string" minOccurs="0" />
-                    <element name="url_path" type="xsd:string" minOccurs="0" />
-                    <element name="visibility" type="xsd:string" minOccurs="0" />
-                    <element name="category_ids" type="typens:ArrayOfString" minOccurs="0" />
-                    <element name="website_ids" type="typens:ArrayOfString" minOccurs="0" />
-                    <element name="has_options" type="xsd:string" minOccurs="0" />
-                    <element name="gift_message_available" type="xsd:string" minOccurs="0" />
-                    <element name="price" type="xsd:string" minOccurs="0" />
-                    <element name="special_price" type="xsd:string" minOccurs="0" />
-                    <element name="special_from_date" type="xsd:string" minOccurs="0" />
-                    <element name="special_to_date" type="xsd:string" minOccurs="0" />
-                    <element name="tax_class_id" type="xsd:string" minOccurs="0" />
-                    <element name="tier_price" type="typens:catalogProductTierPriceEntityArray" minOccurs="0" />
-                    <element name="meta_title" type="xsd:string" minOccurs="0" />
-                    <element name="meta_keyword" type="xsd:string" minOccurs="0" />
-                    <element name="meta_description" type="xsd:string" minOccurs="0" />
-                    <element name="custom_design" type="xsd:string" minOccurs="0" />
-                    <element name="custom_layout_update" type="xsd:string" minOccurs="0" />
-                    <element name="options_container" type="xsd:string" minOccurs="0" />
-                    <element name="additional_attributes" type="typens:associativeArray" minOccurs="0" />
+                    <element name="categories" type="typens:ArrayOfString" minOccurs="0"/>
+                    <element name="websites" type="typens:ArrayOfString" minOccurs="0"/>
+                    <element name="name" type="xsd:string" minOccurs="0"/>
+                    <element name="description" type="xsd:string" minOccurs="0"/>
+                    <element name="short_description" type="xsd:string" minOccurs="0"/>
+                    <element name="weight" type="xsd:string" minOccurs="0"/>
+                    <element name="status" type="xsd:string" minOccurs="0"/>
+                    <element name="url_key" type="xsd:string" minOccurs="0"/>
+                    <element name="url_path" type="xsd:string" minOccurs="0"/>
+                    <element name="visibility" type="xsd:string" minOccurs="0"/>
+                    <element name="category_ids" type="typens:ArrayOfString" minOccurs="0"/>
+                    <element name="website_ids" type="typens:ArrayOfString" minOccurs="0"/>
+                    <element name="has_options" type="xsd:string" minOccurs="0"/>
+                    <element name="gift_message_available" type="xsd:string" minOccurs="0"/>
+                    <element name="price" type="xsd:string" minOccurs="0"/>
+                    <element name="special_price" type="xsd:string" minOccurs="0"/>
+                    <element name="special_from_date" type="xsd:string" minOccurs="0"/>
+                    <element name="special_to_date" type="xsd:string" minOccurs="0"/>
+                    <element name="tax_class_id" type="xsd:string" minOccurs="0"/>
+                    <element name="tier_price" type="typens:catalogProductTierPriceEntityArray" minOccurs="0"/>
+                    <element name="meta_title" type="xsd:string" minOccurs="0"/>
+                    <element name="meta_keyword" type="xsd:string" minOccurs="0"/>
+                    <element name="meta_description" type="xsd:string" minOccurs="0"/>
+                    <element name="custom_design" type="xsd:string" minOccurs="0"/>
+                    <element name="custom_layout_update" type="xsd:string" minOccurs="0"/>
+                    <element name="options_container" type="xsd:string" minOccurs="0"/>
+                    <element name="additional_attributes" type="typens:associativeArray" minOccurs="0"/>
                 </all>
             </complexType>
             <complexType name="catalogProductAttributeSetEntity">
                 <all>
-                    <element name="set_id" type="xsd:int" minOccurs="0" />
-                    <element name="name" type="xsd:string" minOccurs="0" />
+                    <element name="set_id" type="xsd:int" minOccurs="0"/>
+                    <element name="name" type="xsd:string" minOccurs="0"/>
                 </all>
             </complexType>
             <complexType name="catalogProductAttributeSetEntityArray">
                 <complexContent>
                     <restriction base="soapenc:Array">
-                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogProductAttributeSetEntity[]" />
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogProductAttributeSetEntity[]"/>
                     </restriction>
                 </complexContent>
             </complexType>
             <complexType name="catalogProductTypeEntity">
                 <all>
-                    <element name="type" type="xsd:string" minOccurs="0" />
-                    <element name="label" type="xsd:string" minOccurs="0" />
+                    <element name="type" type="xsd:string" minOccurs="0"/>
+                    <element name="label" type="xsd:string" minOccurs="0"/>
                 </all>
             </complexType>
             <complexType name="catalogProductTypeEntityArray">
                 <complexContent>
                     <restriction base="soapenc:Array">
-                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogProductTypeEntity[]" />
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogProductTypeEntity[]"/>
                     </restriction>
                 </complexContent>
             </complexType>
             <complexType name="catalogProductTierPriceEntity">
                 <all>
-                    <element name="customer_group_id" type="xsd:string" minOccurs="0" />
-                    <element name="website" type="xsd:string" minOccurs="0" />
-                    <element name="qty" type="xsd:int" minOccurs="0" />
-                    <element name="price" type="xsd:double" minOccurs="0" />
+                    <element name="customer_group_id" type="xsd:string" minOccurs="0"/>
+                    <element name="website" type="xsd:string" minOccurs="0"/>
+                    <element name="qty" type="xsd:int" minOccurs="0"/>
+                    <element name="price" type="xsd:double" minOccurs="0"/>
                 </all>
             </complexType>
             <complexType name="catalogProductTierPriceEntityArray">
                 <complexContent>
                     <restriction base="soapenc:Array">
-                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogProductTierPriceEntity[]" />
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogProductTierPriceEntity[]"/>
                     </restriction>
                 </complexContent>
             </complexType>
             <complexType name="ArrayOfCatalogCategoryEntities">
                 <complexContent>
                     <restriction base="soapenc:Array">
-                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogCategoryEntity[]" />
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogCategoryEntity[]"/>
                     </restriction>
                 </complexContent>
             </complexType>
             <complexType name="catalogCategoryEntity">
                 <all>
-                    <element name="category_id" type="xsd:int" />
-                    <element name="parent_id" type="xsd:int" />
-                    <element name="name" type="xsd:string" />
-                    <element name="is_active" type="xsd:int" />
-                    <element name="position" type="xsd:int" />
-                    <element name="level" type="xsd:int" />
-                    <element name="children" type="typens:ArrayOfCatalogCategoryEntities" />
+                    <element name="category_id" type="xsd:int"/>
+                    <element name="parent_id" type="xsd:int"/>
+                    <element name="name" type="xsd:string"/>
+                    <element name="is_active" type="xsd:int"/>
+                    <element name="position" type="xsd:int"/>
+                    <element name="level" type="xsd:int"/>
+                    <element name="children" type="typens:ArrayOfCatalogCategoryEntities"/>
                 </all>
             </complexType>
             <complexType name="catalogCategoryEntityNoChildren">
                 <all>
-                    <element name="category_id" type="xsd:int" />
-                    <element name="parent_id" type="xsd:int" />
-                    <element name="name" type="xsd:string" />
-                    <element name="is_active" type="xsd:int" />
-                    <element name="position" type="xsd:int" />
-                    <element name="level" type="xsd:int" />
+                    <element name="category_id" type="xsd:int"/>
+                    <element name="parent_id" type="xsd:int"/>
+                    <element name="name" type="xsd:string"/>
+                    <element name="is_active" type="xsd:int"/>
+                    <element name="position" type="xsd:int"/>
+                    <element name="level" type="xsd:int"/>
                 </all>
             </complexType>
             <complexType name="ArrayOfCatalogCategoryEntitiesNoChildren">
                 <complexContent>
                     <restriction base="soapenc:Array">
-                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogCategoryEntityNoChildren[]" />
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogCategoryEntityNoChildren[]"/>
                     </restriction>
                 </complexContent>
             </complexType>
             <complexType name="catalogCategoryTree">
                 <all>
-                    <element name="category_id" type="xsd:int" />
-                    <element name="parent_id" type="xsd:int" />
-                    <element name="name" type="xsd:string" />
-                    <element name="position" type="xsd:int" />
-                    <element name="level" type="xsd:int" />
-                    <element name="children" type="typens:ArrayOfCatalogCategoryEntities" />
+                    <element name="category_id" type="xsd:int"/>
+                    <element name="parent_id" type="xsd:int"/>
+                    <element name="name" type="xsd:string"/>
+                    <element name="position" type="xsd:int"/>
+                    <element name="level" type="xsd:int"/>
+                    <element name="children" type="typens:ArrayOfCatalogCategoryEntities"/>
                 </all>
             </complexType>
             <complexType name="catalogCategoryEntityCreate">
                 <all>
-                    <element name="name" type="xsd:string" minOccurs="0" />
-                    <element name="is_active" type="xsd:int" minOccurs="0" />
-                    <element name="position" type="xsd:int" minOccurs="0" />
-                    <element name="available_sort_by" type="typens:ArrayOfString" minOccurs="0" />
-                    <element name="custom_design" type="xsd:string" minOccurs="0" />
-                    <element name="custom_design_apply" type="xsd:int" minOccurs="0" />
-                    <element name="custom_design_from" type="xsd:string" minOccurs="0" />
-                    <element name="custom_design_to" type="xsd:string" minOccurs="0" />
-                    <element name="custom_layout_update" type="xsd:string" minOccurs="0" />
-                    <element name="default_sort_by" type="xsd:string" minOccurs="0" />
-                    <element name="description" type="xsd:string" minOccurs="0" />
-                    <element name="display_mode" type="xsd:string" minOccurs="0" />
-                    <element name="is_anchor" type="xsd:int" minOccurs="0" />
-                    <element name="landing_page" type="xsd:int" minOccurs="0" />
-                    <element name="meta_description" type="xsd:string" minOccurs="0" />
-                    <element name="meta_keywords" type="xsd:string" minOccurs="0" />
-                    <element name="meta_title" type="xsd:string" minOccurs="0" />
-                    <element name="page_layout" type="xsd:string" minOccurs="0" />
-                    <element name="url_key" type="xsd:string" minOccurs="0" />
+                    <element name="name" type="xsd:string" minOccurs="0"/>
+                    <element name="is_active" type="xsd:int" minOccurs="0"/>
+                    <element name="position" type="xsd:int" minOccurs="0"/>
+                    <element name="available_sort_by" type="typens:ArrayOfString" minOccurs="0"/>
+                    <element name="custom_design" type="xsd:string" minOccurs="0"/>
+                    <element name="custom_design_apply" type="xsd:int" minOccurs="0"/>
+                    <element name="custom_design_from" type="xsd:string" minOccurs="0"/>
+                    <element name="custom_design_to" type="xsd:string" minOccurs="0"/>
+                    <element name="custom_layout_update" type="xsd:string" minOccurs="0"/>
+                    <element name="default_sort_by" type="xsd:string" minOccurs="0"/>
+                    <element name="description" type="xsd:string" minOccurs="0"/>
+                    <element name="display_mode" type="xsd:string" minOccurs="0"/>
+                    <element name="is_anchor" type="xsd:int" minOccurs="0"/>
+                    <element name="landing_page" type="xsd:int" minOccurs="0"/>
+                    <element name="meta_description" type="xsd:string" minOccurs="0"/>
+                    <element name="meta_keywords" type="xsd:string" minOccurs="0"/>
+                    <element name="meta_title" type="xsd:string" minOccurs="0"/>
+                    <element name="page_layout" type="xsd:string" minOccurs="0"/>
+                    <element name="url_key" type="xsd:string" minOccurs="0"/>
+                    <element name="include_in_menu" type="xsd:int" minOccurs="0"/>
                 </all>
             </complexType>
             <complexType name="catalogCategoryInfo">
                 <all>
-                    <element name="category_id" type="xsd:string" />
-                    <element name="is_active" type="xsd:int" />
-                    <element name="position" type="xsd:string" />
-                    <element name="level" type="xsd:string" />
-                    <element name="parent_id" type="xsd:string" />
-                    <element name="all_children" type="xsd:string" />
-                    <element name="children" type="xsd:string" />
-                    <element name="created_at" type="xsd:string" minOccurs="0" />
-                    <element name="updated_at" type="xsd:string" minOccurs="0" />
-                    <element name="name" type="xsd:string" minOccurs="0" />
-                    <element name="url_key" type="xsd:string" minOccurs="0" />
-                    <element name="description" type="xsd:string" minOccurs="0" />
-                    <element name="meta_title" type="xsd:string" minOccurs="0" />
-                    <element name="meta_keywords" type="xsd:string" minOccurs="0" />
-                    <element name="meta_description" type="xsd:string" minOccurs="0" />
-                    <element name="path" type="xsd:string" minOccurs="0" />
-                    <element name="url_path" type="xsd:string" minOccurs="0" />
-                    <element name="children_count" type="xsd:int" minOccurs="0" />
-                    <element name="display_mode" type="xsd:string" minOccurs="0" />
-                    <element name="is_anchor" type="xsd:int" minOccurs="0" />
-                    <element name="available_sort_by" type="typens:ArrayOfString" minOccurs="0" />
-                    <element name="custom_design" type="xsd:string" minOccurs="0" />
-                    <element name="custom_design_apply" type="xsd:string" minOccurs="0" />
-                    <element name="custom_design_from" type="xsd:string" minOccurs="0" />
-                    <element name="custom_design_to" type="xsd:string" minOccurs="0" />
-                    <element name="page_layout" type="xsd:string" minOccurs="0" />
-                    <element name="custom_layout_update" type="xsd:string" minOccurs="0" />
-                    <element name="default_sort_by" type="xsd:string" minOccurs="0" />
-                    <element name="landing_page" type="xsd:int" minOccurs="0" />
+                    <element name="category_id" type="xsd:string"/>
+                    <element name="is_active" type="xsd:int"/>
+                    <element name="position" type="xsd:string"/>
+                    <element name="level" type="xsd:string"/>
+                    <element name="parent_id" type="xsd:string"/>
+                    <element name="all_children" type="xsd:string"/>
+                    <element name="children" type="xsd:string"/>
+                    <element name="created_at" type="xsd:string" minOccurs="0"/>
+                    <element name="updated_at" type="xsd:string" minOccurs="0"/>
+                    <element name="name" type="xsd:string" minOccurs="0"/>
+                    <element name="url_key" type="xsd:string" minOccurs="0"/>
+                    <element name="description" type="xsd:string" minOccurs="0"/>
+                    <element name="meta_title" type="xsd:string" minOccurs="0"/>
+                    <element name="meta_keywords" type="xsd:string" minOccurs="0"/>
+                    <element name="meta_description" type="xsd:string" minOccurs="0"/>
+                    <element name="path" type="xsd:string" minOccurs="0"/>
+                    <element name="url_path" type="xsd:string" minOccurs="0"/>
+                    <element name="children_count" type="xsd:int" minOccurs="0"/>
+                    <element name="display_mode" type="xsd:string" minOccurs="0"/>
+                    <element name="is_anchor" type="xsd:int" minOccurs="0"/>
+                    <element name="available_sort_by" type="typens:ArrayOfString" minOccurs="0"/>
+                    <element name="custom_design" type="xsd:string" minOccurs="0"/>
+                    <element name="custom_design_apply" type="xsd:string" minOccurs="0"/>
+                    <element name="custom_design_from" type="xsd:string" minOccurs="0"/>
+                    <element name="custom_design_to" type="xsd:string" minOccurs="0"/>
+                    <element name="page_layout" type="xsd:string" minOccurs="0"/>
+                    <element name="custom_layout_update" type="xsd:string" minOccurs="0"/>
+                    <element name="default_sort_by" type="xsd:string" minOccurs="0"/>
+                    <element name="landing_page" type="xsd:int" minOccurs="0"/>
                 </all>
             </complexType>
             <complexType name="catalogAssignedProduct">
                 <all>
-                    <element name="product_id" type="xsd:int" />
-                    <element name="type" type="xsd:string" />
-                    <element name="set" type="xsd:int" />
-                    <element name="sku" type="xsd:string" />
-                    <element name="position" type="xsd:int" />
+                    <element name="product_id" type="xsd:int"/>
+                    <element name="type" type="xsd:string"/>
+                    <element name="set" type="xsd:int"/>
+                    <element name="sku" type="xsd:string"/>
+                    <element name="position" type="xsd:int"/>
                 </all>
             </complexType>
             <complexType name="catalogAssignedProductArray">
                 <complexContent>
                     <restriction base="soapenc:Array">
-                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogAssignedProduct[]" />
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogAssignedProduct[]"/>
                     </restriction>
                 </complexContent>
             </complexType>
             <complexType name="catalogAttributeEntity">
                 <all>
-                    <element name="attribute_id" type="xsd:int" minOccurs="0" />
-                    <element name="code" type="xsd:string" minOccurs="0" />
-                    <element name="type" type="xsd:string" minOccurs="0" />
-                    <element name="required" type="xsd:string" minOccurs="0" />
-                    <element name="scope" type="xsd:string" minOccurs="0" />
+                    <element name="attribute_id" type="xsd:int" minOccurs="0"/>
+                    <element name="code" type="xsd:string" minOccurs="0"/>
+                    <element name="type" type="xsd:string" minOccurs="0"/>
+                    <element name="required" type="xsd:string" minOccurs="0"/>
+                    <element name="scope" type="xsd:string" minOccurs="0"/>
                 </all>
             </complexType>
             <complexType name="catalogAttributeEntityArray">
                 <complexContent>
                     <restriction base="soapenc:Array">
-                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogAttributeEntity[]" />
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogAttributeEntity[]"/>
                     </restriction>
                 </complexContent>
             </complexType>
             <complexType name="catalogAttributeOptionEntity">
                 <all>
-                    <element name="label" type="xsd:string" />
-                    <element name="value" type="xsd:string" />
+                    <element name="label" type="xsd:string"/>
+                    <element name="value" type="xsd:string"/>
                 </all>
             </complexType>
             <complexType name="catalogAttributeOptionEntityArray">
                 <complexContent>
                     <restriction base="soapenc:Array">
-                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogAttributeOptionEntity[]" />
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogAttributeOptionEntity[]"/>
                     </restriction>
                 </complexContent>
             </complexType>
             <complexType name="catalogProductImageEntity">
                 <all>
-                    <element name="file" type="xsd:string" />
-                    <element name="label" type="xsd:string" />
-                    <element name="position" type="xsd:string" />
-                    <element name="exclude" type="xsd:string" />
-                    <element name="url" type="xsd:string" />
-                    <element name="types" type="typens:ArrayOfString" />
+                    <element name="file" type="xsd:string"/>
+                    <element name="label" type="xsd:string"/>
+                    <element name="position" type="xsd:string"/>
+                    <element name="exclude" type="xsd:string"/>
+                    <element name="url" type="xsd:string"/>
+                    <element name="types" type="typens:ArrayOfString"/>
                 </all>
             </complexType>
             <complexType name="catalogProductImageEntityArray">
                 <complexContent>
                     <restriction base="soapenc:Array">
-                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogProductImageEntity[]" />
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogProductImageEntity[]"/>
                     </restriction>
                 </complexContent>
             </complexType>
             <complexType name="catalogProductAttributeMediaTypeEntity">
                 <all>
-                    <element name="code" type="xsd:string" />
-                    <element name="scope" type="xsd:string" />
+                    <element name="code" type="xsd:string"/>
+                    <element name="scope" type="xsd:string"/>
                 </all>
             </complexType>
             <complexType name="catalogProductAttributeMediaTypeEntityArray">
                 <complexContent>
                     <restriction base="soapenc:Array">
-                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogProductAttributeMediaTypeEntity[]" />
+                        <attribute ref="soapenc:arrayType"
+                                   wsdl:arrayType="typens:catalogProductAttributeMediaTypeEntity[]"/>
                     </restriction>
                 </complexContent>
             </complexType>
             <complexType name="catalogProductImageFileEntity">
                 <all>
-                    <element name="content" type="xsd:string" />
-                    <element name="mime" type="xsd:string" />
-                    <element name="name" type="xsd:string" minOccurs="0" />
+                    <element name="content" type="xsd:string"/>
+                    <element name="mime" type="xsd:string"/>
+                    <element name="name" type="xsd:string" minOccurs="0"/>
                 </all>
             </complexType>
             <complexType name="catalogProductAttributeMediaCreateEntity">
                 <all>
-                    <element name="file" type="typens:catalogProductImageFileEntity" minOccurs="0" />
-                    <element name="label" type="xsd:string" minOccurs="0" />
-                    <element name="position" type="xsd:string" minOccurs="0" />
-                    <element name="types" type="typens:ArrayOfString" minOccurs="0" />
-                    <element name="exclude" type="xsd:string" minOccurs="0" />
-                    <element name="remove" type="xsd:string" minOccurs="0" />
+                    <element name="file" type="typens:catalogProductImageFileEntity" minOccurs="0"/>
+                    <element name="label" type="xsd:string" minOccurs="0"/>
+                    <element name="position" type="xsd:string" minOccurs="0"/>
+                    <element name="types" type="typens:ArrayOfString" minOccurs="0"/>
+                    <element name="exclude" type="xsd:string" minOccurs="0"/>
+                    <element name="remove" type="xsd:string" minOccurs="0"/>
                 </all>
             </complexType>
             <complexType name="catalogProductLinkEntity">
                 <all>
-                    <element name="product_id" type="xsd:string" minOccurs="0" />
-                    <element name="type" type="xsd:string" minOccurs="0" />
-                    <element name="set" type="xsd:string" minOccurs="0" />
-                    <element name="sku" type="xsd:string" minOccurs="0" />
-                    <element name="position" type="xsd:string" minOccurs="0" />
-                    <element name="qty" type="xsd:string" minOccurs="0" />
+                    <element name="product_id" type="xsd:string" minOccurs="0"/>
+                    <element name="type" type="xsd:string" minOccurs="0"/>
+                    <element name="set" type="xsd:string" minOccurs="0"/>
+                    <element name="sku" type="xsd:string" minOccurs="0"/>
+                    <element name="position" type="xsd:string" minOccurs="0"/>
+                    <element name="qty" type="xsd:string" minOccurs="0"/>
                 </all>
             </complexType>
             <complexType name="catalogProductLinkEntityArray">
                 <complexContent>
                     <restriction base="soapenc:Array">
-                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogProductLinkEntity[]" />
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogProductLinkEntity[]"/>
                     </restriction>
                 </complexContent>
             </complexType>
             <complexType name="catalogProductLinkAttributeEntity">
                 <all>
-                    <element name="code" type="xsd:string" minOccurs="0" />
-                    <element name="type" type="xsd:string" minOccurs="0" />
+                    <element name="code" type="xsd:string" minOccurs="0"/>
+                    <element name="type" type="xsd:string" minOccurs="0"/>
                 </all>
             </complexType>
             <complexType name="catalogProductLinkAttributeEntityArray">
                 <complexContent>
                     <restriction base="soapenc:Array">
-                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogProductLinkAttributeEntity[]" />
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:catalogProductLinkAttributeEntity[]"/>
                     </restriction>
                 </complexContent>
             </complexType>
         </schema>
     </types>
     <message name="catalogProductCurrentStoreRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="storeView" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="storeView" type="xsd:string"/>
     </message>
     <message name="catalogProductCurrentStoreResponse">
-        <part name="storeView" type="xsd:int" />
+        <part name="storeView" type="xsd:int"/>
     </message>
     <message name="catalogProductListRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="filters" type="typens:filters" />
-        <part name="storeView" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="filters" type="typens:filters"/>
+        <part name="storeView" type="xsd:string"/>
     </message>
     <message name="catalogProductListResponse">
-        <part name="storeView" type="typens:catalogProductEntityArray" />
+        <part name="storeView" type="typens:catalogProductEntityArray"/>
     </message>
     <message name="catalogProductInfoRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="product" type="xsd:string" />
-        <part name="storeView" type="xsd:string" />
-        <part name="attributes" type="typens:catalogProductRequestAttributes" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="product" type="xsd:string"/>
+        <part name="storeView" type="xsd:string"/>
+        <part name="attributes" type="typens:catalogProductRequestAttributes"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductInfoResponse">
-        <part name="info" type="typens:catalogProductReturnEntity" />
+        <part name="info" type="typens:catalogProductReturnEntity"/>
     </message>
     <message name="catalogProductCreateRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="type" type="xsd:string" />
-        <part name="set" type="xsd:string" />
-        <part name="sku" type="xsd:string" />
-        <part name="productData" type="typens:catalogProductCreateEntity" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="type" type="xsd:string"/>
+        <part name="set" type="xsd:string"/>
+        <part name="sku" type="xsd:string"/>
+        <part name="productData" type="typens:catalogProductCreateEntity"/>
+        <part name="storeView" type="xsd:string"/>
     </message>
     <message name="catalogProductCreateResponse">
-        <part name="result" type="xsd:int" />
+        <part name="result" type="xsd:int"/>
     </message>
     <message name="catalogProductUpdateRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="product" type="xsd:string" />
-        <part name="productData" type="typens:catalogProductCreateEntity" />
-        <part name="storeView" type="xsd:string" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="product" type="xsd:string"/>
+        <part name="productData" type="typens:catalogProductCreateEntity"/>
+        <part name="storeView" type="xsd:string"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductUpdateResponse">
-        <part name="result" type="xsd:boolean" />
+        <part name="result" type="xsd:boolean"/>
     </message>
     <message name="catalogProductSetSpecialPriceRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="product" type="xsd:string" />
-        <part name="specialPrice" type="xsd:string" />
-        <part name="fromDate" type="xsd:string" />
-        <part name="toDate" type="xsd:string" />
-        <part name="storeView" type="xsd:string" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="product" type="xsd:string"/>
+        <part name="specialPrice" type="xsd:string"/>
+        <part name="fromDate" type="xsd:string"/>
+        <part name="toDate" type="xsd:string"/>
+        <part name="storeView" type="xsd:string"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductSetSpecialPriceResponse">
-        <part name="result" type="xsd:int" />
+        <part name="result" type="xsd:int"/>
     </message>
     <message name="catalogProductGetSpecialPriceRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="product" type="xsd:string" />
-        <part name="storeView" type="xsd:string" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="product" type="xsd:string"/>
+        <part name="storeView" type="xsd:string"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductGetSpecialPriceResponse">
-        <part name="result" type="typens:catalogProductReturnEntity" />
+        <part name="result" type="typens:catalogProductReturnEntity"/>
     </message>
     <message name="catalogProductDeleteRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="product" type="xsd:string" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="product" type="xsd:string"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductDeleteResponse">
-        <part name="result" type="xsd:int" />
+        <part name="result" type="xsd:int"/>
     </message>
     <message name="catalogProductAttributeCurrentStoreRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="storeView" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="storeView" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeCurrentStoreResponse">
-        <part name="storeView" type="xsd:int" />
+        <part name="storeView" type="xsd:int"/>
     </message>
     <message name="catalogProductAttributeListRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="setId" type="xsd:int" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="setId" type="xsd:int"/>
     </message>
     <message name="catalogProductAttributeListResponse">
-        <part name="result" type="typens:catalogAttributeEntityArray" />
+        <part name="result" type="typens:catalogAttributeEntityArray"/>
     </message>
     <message name="catalogProductAttributeOptionsRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="attributeId" type="xsd:string" />
-        <part name="storeView" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="attributeId" type="xsd:string"/>
+        <part name="storeView" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeOptionsResponse">
-        <part name="result" type="typens:catalogAttributeOptionEntityArray" />
+        <part name="result" type="typens:catalogAttributeOptionEntityArray"/>
     </message>
     <message name="catalogProductAttributeSetListRequest">
-        <part name="sessionId" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeSetListResponse">
-        <part name="result" type="typens:catalogProductAttributeSetEntityArray" />
+        <part name="result" type="typens:catalogProductAttributeSetEntityArray"/>
     </message>
     <message name="catalogProductTypeListRequest">
-        <part name="sessionId" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
     </message>
     <message name="catalogProductTypeListResponse">
-        <part name="result" type="typens:catalogProductTypeEntityArray" />
+        <part name="result" type="typens:catalogProductTypeEntityArray"/>
     </message>
     <message name="catalogProductAttributeTierPriceInfoRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="product" type="xsd:string" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="product" type="xsd:string"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeTierPriceInfoResponse">
-        <part name="result" type="typens:catalogProductTierPriceEntityArray" />
+        <part name="result" type="typens:catalogProductTierPriceEntityArray"/>
     </message>
     <message name="catalogProductAttributeTierPriceUpdateRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="product" type="xsd:string" />
-        <part name="tier_price" type="typens:catalogProductTierPriceEntityArray" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="product" type="xsd:string"/>
+        <part name="tier_price" type="typens:catalogProductTierPriceEntityArray"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeTierPriceUpdateResponse">
-        <part name="result" type="xsd:int" />
+        <part name="result" type="xsd:int"/>
     </message>
     <message name="catalogProductAttributeMediaCurrentStoreRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="storeView" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="storeView" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeMediaCurrentStoreResponse">
-        <part name="storeView" type="xsd:int" />
+        <part name="storeView" type="xsd:int"/>
     </message>
     <message name="catalogProductAttributeMediaListRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="product" type="xsd:string" />
-        <part name="storeView" type="xsd:string" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="product" type="xsd:string"/>
+        <part name="storeView" type="xsd:string"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeMediaListResponse">
-        <part name="result" type="typens:catalogProductImageEntityArray" />
+        <part name="result" type="typens:catalogProductImageEntityArray"/>
     </message>
     <message name="catalogProductAttributeMediaInfoRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="product" type="xsd:string" />
-        <part name="file" type="xsd:string" />
-        <part name="storeView" type="xsd:string" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="product" type="xsd:string"/>
+        <part name="file" type="xsd:string"/>
+        <part name="storeView" type="xsd:string"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeMediaInfoResponse">
-        <part name="result" type="typens:catalogProductImageEntity" />
+        <part name="result" type="typens:catalogProductImageEntity"/>
     </message>
     <message name="catalogProductAttributeMediaTypesRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="setId" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="setId" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeMediaTypesResponse">
-        <part name="result" type="typens:catalogProductAttributeMediaTypeEntityArray" />
+        <part name="result" type="typens:catalogProductAttributeMediaTypeEntityArray"/>
     </message>
     <message name="catalogProductAttributeMediaCreateRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="product" type="xsd:string" />
-        <part name="data" type="typens:catalogProductAttributeMediaCreateEntity" />
-        <part name="storeView" type="xsd:string" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="product" type="xsd:string"/>
+        <part name="data" type="typens:catalogProductAttributeMediaCreateEntity"/>
+        <part name="storeView" type="xsd:string"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeMediaCreateResponse">
-        <part name="result" type="xsd:string" />
+        <part name="result" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeMediaUpdateRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="product" type="xsd:string" />
-        <part name="file" type="xsd:string" />
-        <part name="data" type="typens:catalogProductAttributeMediaCreateEntity" />
-        <part name="storeView" type="xsd:string" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="product" type="xsd:string"/>
+        <part name="file" type="xsd:string"/>
+        <part name="data" type="typens:catalogProductAttributeMediaCreateEntity"/>
+        <part name="storeView" type="xsd:string"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeMediaUpdateResponse">
-        <part name="result" type="xsd:int" />
+        <part name="result" type="xsd:int"/>
     </message>
     <message name="catalogProductAttributeMediaRemoveRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="product" type="xsd:string" />
-        <part name="file" type="xsd:string" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="product" type="xsd:string"/>
+        <part name="file" type="xsd:string"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductAttributeMediaRemoveResponse">
-        <part name="result" type="xsd:int" />
+        <part name="result" type="xsd:int"/>
     </message>
     <message name="catalogProductLinkListRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="type" type="xsd:string" />
-        <part name="product" type="xsd:string" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="type" type="xsd:string"/>
+        <part name="product" type="xsd:string"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductLinkListResponse">
-        <part name="result" type="typens:catalogProductLinkEntityArray" />
+        <part name="result" type="typens:catalogProductLinkEntityArray"/>
     </message>
     <message name="catalogProductLinkAssignRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="type" type="xsd:string" />
-        <part name="product" type="xsd:string" />
-        <part name="linkedProduct" type="xsd:string" />
-        <part name="data" type="typens:catalogProductLinkEntity" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="type" type="xsd:string"/>
+        <part name="product" type="xsd:string"/>
+        <part name="linkedProduct" type="xsd:string"/>
+        <part name="data" type="typens:catalogProductLinkEntity"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductLinkAssignResponse">
-        <part name="result" type="xsd:string" />
+        <part name="result" type="xsd:string"/>
     </message>
     <message name="catalogProductLinkUpdateRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="type" type="xsd:string" />
-        <part name="product" type="xsd:string" />
-        <part name="linkedProduct" type="xsd:string" />
-        <part name="data" type="typens:catalogProductLinkEntity" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="type" type="xsd:string"/>
+        <part name="product" type="xsd:string"/>
+        <part name="linkedProduct" type="xsd:string"/>
+        <part name="data" type="typens:catalogProductLinkEntity"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductLinkUpdateResponse">
-        <part name="result" type="xsd:string" />
+        <part name="result" type="xsd:string"/>
     </message>
     <message name="catalogProductLinkRemoveRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="type" type="xsd:string" />
-        <part name="product" type="xsd:string" />
-        <part name="linkedProduct" type="xsd:string" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="type" type="xsd:string"/>
+        <part name="product" type="xsd:string"/>
+        <part name="linkedProduct" type="xsd:string"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogProductLinkRemoveResponse">
-        <part name="result" type="xsd:string" />
+        <part name="result" type="xsd:string"/>
     </message>
     <message name="catalogProductLinkTypesRequest">
-        <part name="sessionId" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
     </message>
     <message name="catalogProductLinkTypesResponse">
-        <part name="result" type="typens:ArrayOfString" />
+        <part name="result" type="typens:ArrayOfString"/>
     </message>
     <message name="catalogProductLinkAttributesRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="type" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="type" type="xsd:string"/>
     </message>
     <message name="catalogProductLinkAttributesResponse">
-        <part name="result" type="typens:catalogProductLinkAttributeEntityArray" />
+        <part name="result" type="typens:catalogProductLinkAttributeEntityArray"/>
     </message>
     <message name="catalogCategoryCurrentStoreRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="storeView" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="storeView" type="xsd:string"/>
     </message>
     <message name="catalogCategoryCurrentStoreResponse">
-        <part name="storeView" type="xsd:int" />
+        <part name="storeView" type="xsd:int"/>
     </message>
     <message name="catalogCategoryTreeRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="parentId" type="xsd:string" />
-        <part name="storeView" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="parentId" type="xsd:string"/>
+        <part name="storeView" type="xsd:string"/>
     </message>
     <message name="catalogCategoryTreeResponse">
-        <part name="tree" type="typens:catalogCategoryTree" />
+        <part name="tree" type="typens:catalogCategoryTree"/>
     </message>
     <message name="catalogCategoryLevelRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="website" type="xsd:string" />
-        <part name="storeView" type="xsd:string" />
-        <part name="parentCategory" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="website" type="xsd:string"/>
+        <part name="storeView" type="xsd:string"/>
+        <part name="parentCategory" type="xsd:string"/>
     </message>
     <message name="catalogCategoryLevelResponse">
-        <part name="tree" type="typens:ArrayOfCatalogCategoryEntitiesNoChildren" />
+        <part name="tree" type="typens:ArrayOfCatalogCategoryEntitiesNoChildren"/>
     </message>
     <message name="catalogCategoryInfoRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="categoryId" type="xsd:int" />
-        <part name="storeView" type="xsd:string" />
-        <part name="attributes" type="typens:ArrayOfString" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="categoryId" type="xsd:int"/>
+        <part name="storeView" type="xsd:string"/>
+        <part name="attributes" type="typens:ArrayOfString"/>
     </message>
     <message name="catalogCategoryInfoResponse">
-        <part name="info" type="typens:catalogCategoryInfo" />
+        <part name="info" type="typens:catalogCategoryInfo"/>
     </message>
     <message name="catalogCategoryCreateRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="parentId" type="xsd:int" />
-        <part name="categoryData" type="typens:catalogCategoryEntityCreate" />
-        <part name="storeView" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="parentId" type="xsd:int"/>
+        <part name="categoryData" type="typens:catalogCategoryEntityCreate"/>
+        <part name="storeView" type="xsd:string"/>
     </message>
     <message name="catalogCategoryCreateResponse">
-        <part name="id" type="xsd:int" />
+        <part name="id" type="xsd:int"/>
     </message>
     <message name="catalogCategoryUpdateRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="categoryId" type="xsd:int" />
-        <part name="categoryData" type="typens:catalogCategoryEntityCreate" />
-        <part name="storeView" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="categoryId" type="xsd:int"/>
+        <part name="categoryData" type="typens:catalogCategoryEntityCreate"/>
+        <part name="storeView" type="xsd:string"/>
     </message>
     <message name="catalogCategoryUpdateResponse">
-        <part name="id" type="xsd:boolean" />
+        <part name="id" type="xsd:boolean"/>
     </message>
     <message name="catalogCategoryMoveRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="categoryId" type="xsd:int" />
-        <part name="parentId" type="xsd:int" />
-        <part name="afterId" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="categoryId" type="xsd:int"/>
+        <part name="parentId" type="xsd:int"/>
+        <part name="afterId" type="xsd:string"/>
     </message>
     <message name="catalogCategoryMoveResponse">
-        <part name="id" type="xsd:boolean" />
+        <part name="id" type="xsd:boolean"/>
     </message>
     <message name="catalogCategoryDeleteRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="categoryId" type="xsd:int" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="categoryId" type="xsd:int"/>
     </message>
     <message name="catalogCategoryDeleteResponse">
-        <part name="result" type="xsd:boolean" />
+        <part name="result" type="xsd:boolean"/>
     </message>
     <message name="catalogCategoryAssignedProductsRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="categoryId" type="xsd:int" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="categoryId" type="xsd:int"/>
     </message>
     <message name="catalogCategoryAssignedProductsResponse">
-        <part name="result" type="typens:catalogAssignedProductArray" />
+        <part name="result" type="typens:catalogAssignedProductArray"/>
     </message>
     <message name="catalogCategoryAssignProductRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="categoryId" type="xsd:int" />
-        <part name="product" type="xsd:string" />
-        <part name="position" type="xsd:string" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="categoryId" type="xsd:int"/>
+        <part name="product" type="xsd:string"/>
+        <part name="position" type="xsd:string"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogCategoryAssignProductResponse">
-        <part name="result" type="xsd:boolean" />
+        <part name="result" type="xsd:boolean"/>
     </message>
     <message name="catalogCategoryUpdateProductRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="categoryId" type="xsd:int" />
-        <part name="product" type="xsd:string" />
-        <part name="position" type="xsd:string" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="categoryId" type="xsd:int"/>
+        <part name="product" type="xsd:string"/>
+        <part name="position" type="xsd:string"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogCategoryUpdateProductResponse">
-        <part name="result" type="xsd:boolean" />
+        <part name="result" type="xsd:boolean"/>
     </message>
     <message name="catalogCategoryRemoveProductRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="categoryId" type="xsd:int" />
-        <part name="product" type="xsd:string" />
-        <part name="productIdentifierType" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="categoryId" type="xsd:int"/>
+        <part name="product" type="xsd:string"/>
+        <part name="productIdentifierType" type="xsd:string"/>
     </message>
     <message name="catalogCategoryRemoveProductResponse">
-        <part name="result" type="xsd:boolean" />
+        <part name="result" type="xsd:boolean"/>
     </message>
     <message name="catalogCategoryAttributeCurrentStoreRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="storeView" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="storeView" type="xsd:string"/>
     </message>
     <message name="catalogCategoryAttributeCurrentStoreResponse">
-        <part name="storeView" type="xsd:int" />
+        <part name="storeView" type="xsd:int"/>
     </message>
     <message name="catalogCategoryAttributeListRequest">
-        <part name="sessionId" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
     </message>
     <message name="catalogCategoryAttributeListResponse">
-        <part name="result" type="typens:catalogAttributeEntityArray" />
+        <part name="result" type="typens:catalogAttributeEntityArray"/>
     </message>
     <message name="catalogCategoryAttributeOptionsRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="attributeId" type="xsd:string" />
-        <part name="storeView" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="attributeId" type="xsd:string"/>
+        <part name="storeView" type="xsd:string"/>
     </message>
     <message name="catalogCategoryAttributeOptionsResponse">
-        <part name="result" type="typens:catalogAttributeOptionEntityArray" />
+        <part name="result" type="typens:catalogAttributeOptionEntityArray"/>
     </message>
     <portType name="{{var wsdl.handler}}PortType">
         <operation name="catalogCategoryCurrentStore">
             <documentation>Set_Get current store view</documentation>
-            <input message="typens:catalogCategoryCurrentStoreRequest" />
-            <output message="typens:catalogCategoryCurrentStoreResponse" />
+            <input message="typens:catalogCategoryCurrentStoreRequest"/>
+            <output message="typens:catalogCategoryCurrentStoreResponse"/>
         </operation>
         <operation name="catalogCategoryTree">
             <documentation>Retrieve hierarchical tree of categories.</documentation>
-            <input message="typens:catalogCategoryTreeRequest" />
-            <output message="typens:catalogCategoryTreeResponse" />
+            <input message="typens:catalogCategoryTreeRequest"/>
+            <output message="typens:catalogCategoryTreeResponse"/>
         </operation>
         <operation name="catalogCategoryLevel">
             <documentation>Retrieve hierarchical tree of categories.</documentation>
-            <input message="typens:catalogCategoryLevelRequest" />
-            <output message="typens:catalogCategoryLevelResponse" />
+            <input message="typens:catalogCategoryLevelRequest"/>
+            <output message="typens:catalogCategoryLevelResponse"/>
         </operation>
         <operation name="catalogCategoryInfo">
             <documentation>Retrieve hierarchical tree of categories.</documentation>
-            <input message="typens:catalogCategoryInfoRequest" />
-            <output message="typens:catalogCategoryInfoResponse" />
+            <input message="typens:catalogCategoryInfoRequest"/>
+            <output message="typens:catalogCategoryInfoResponse"/>
         </operation>
         <operation name="catalogCategoryCreate">
             <documentation>Create new category and return its id.</documentation>
-            <input message="typens:catalogCategoryCreateRequest" />
-            <output message="typens:catalogCategoryCreateResponse" />
+            <input message="typens:catalogCategoryCreateRequest"/>
+            <output message="typens:catalogCategoryCreateResponse"/>
         </operation>
         <operation name="catalogCategoryUpdate">
             <documentation>Update category</documentation>
-            <input message="typens:catalogCategoryUpdateRequest" />
-            <output message="typens:catalogCategoryUpdateResponse" />
+            <input message="typens:catalogCategoryUpdateRequest"/>
+            <output message="typens:catalogCategoryUpdateResponse"/>
         </operation>
         <operation name="catalogCategoryMove">
             <documentation>Move category in tree</documentation>
-            <input message="typens:catalogCategoryMoveRequest" />
-            <output message="typens:catalogCategoryMoveResponse" />
+            <input message="typens:catalogCategoryMoveRequest"/>
+            <output message="typens:catalogCategoryMoveResponse"/>
         </operation>
         <operation name="catalogCategoryDelete">
             <documentation>Delete category</documentation>
-            <input message="typens:catalogCategoryDeleteRequest" />
-            <output message="typens:catalogCategoryDeleteResponse" />
+            <input message="typens:catalogCategoryDeleteRequest"/>
+            <output message="typens:catalogCategoryDeleteResponse"/>
         </operation>
         <operation name="catalogCategoryAssignedProducts">
             <documentation>Retrieve list of assigned products</documentation>
-            <input message="typens:catalogCategoryAssignedProductsRequest" />
-            <output message="typens:catalogCategoryAssignedProductsResponse" />
+            <input message="typens:catalogCategoryAssignedProductsRequest"/>
+            <output message="typens:catalogCategoryAssignedProductsResponse"/>
         </operation>
         <operation name="catalogCategoryAssignProduct">
             <documentation>Assign product to category</documentation>
-            <input message="typens:catalogCategoryAssignProductRequest" />
-            <output message="typens:catalogCategoryAssignProductResponse" />
+            <input message="typens:catalogCategoryAssignProductRequest"/>
+            <output message="typens:catalogCategoryAssignProductResponse"/>
         </operation>
         <operation name="catalogCategoryUpdateProduct">
             <documentation>Update assigned product</documentation>
-            <input message="typens:catalogCategoryUpdateProductRequest" />
-            <output message="typens:catalogCategoryUpdateProductResponse" />
+            <input message="typens:catalogCategoryUpdateProductRequest"/>
+            <output message="typens:catalogCategoryUpdateProductResponse"/>
         </operation>
         <operation name="catalogCategoryRemoveProduct">
             <documentation>Remove product assignment from category</documentation>
-            <input message="typens:catalogCategoryRemoveProductRequest" />
-            <output message="typens:catalogCategoryRemoveProductResponse" />
+            <input message="typens:catalogCategoryRemoveProductRequest"/>
+            <output message="typens:catalogCategoryRemoveProductResponse"/>
         </operation>
         <operation name="catalogCategoryAttributeCurrentStore">
             <documentation>Set/Get current store view</documentation>
-            <input message="typens:catalogCategoryAttributeCurrentStoreRequest" />
-            <output message="typens:catalogCategoryAttributeCurrentStoreResponse" />
+            <input message="typens:catalogCategoryAttributeCurrentStoreRequest"/>
+            <output message="typens:catalogCategoryAttributeCurrentStoreResponse"/>
         </operation>
         <operation name="catalogCategoryAttributeList">
             <documentation>Retrieve category attributes</documentation>
-            <input message="typens:catalogCategoryAttributeListRequest" />
-            <output message="typens:catalogCategoryAttributeListResponse" />
+            <input message="typens:catalogCategoryAttributeListRequest"/>
+            <output message="typens:catalogCategoryAttributeListResponse"/>
         </operation>
         <operation name="catalogCategoryAttributeOptions">
             <documentation>Retrieve attribute options</documentation>
-            <input message="typens:catalogCategoryAttributeOptionsRequest" />
-            <output message="typens:catalogCategoryAttributeOptionsResponse" />
+            <input message="typens:catalogCategoryAttributeOptionsRequest"/>
+            <output message="typens:catalogCategoryAttributeOptionsResponse"/>
         </operation>
         <operation name="catalogProductCurrentStore">
             <documentation>Set/Get current store view</documentation>
-            <input message="typens:catalogProductCurrentStoreRequest" />
-            <output message="typens:catalogProductCurrentStoreResponse" />
+            <input message="typens:catalogProductCurrentStoreRequest"/>
+            <output message="typens:catalogProductCurrentStoreResponse"/>
         </operation>
         <operation name="catalogProductList">
             <documentation>Retrieve products list by filters</documentation>
-            <input message="typens:catalogProductListRequest" />
-            <output message="typens:catalogProductListResponse" />
+            <input message="typens:catalogProductListRequest"/>
+            <output message="typens:catalogProductListResponse"/>
         </operation>
         <operation name="catalogProductInfo">
             <documentation>Retrieve product</documentation>
-            <input message="typens:catalogProductInfoRequest" />
-            <output message="typens:catalogProductInfoResponse" />
+            <input message="typens:catalogProductInfoRequest"/>
+            <output message="typens:catalogProductInfoResponse"/>
         </operation>
         <operation name="catalogProductCreate">
             <documentation>Create new product and return product id</documentation>
-            <input message="typens:catalogProductCreateRequest" />
-            <output message="typens:catalogProductCreateResponse" />
+            <input message="typens:catalogProductCreateRequest"/>
+            <output message="typens:catalogProductCreateResponse"/>
         </operation>
         <operation name="catalogProductUpdate">
             <documentation>Update product</documentation>
-            <input message="typens:catalogProductUpdateRequest" />
-            <output message="typens:catalogProductUpdateResponse" />
+            <input message="typens:catalogProductUpdateRequest"/>
+            <output message="typens:catalogProductUpdateResponse"/>
         </operation>
         <operation name="catalogProductSetSpecialPrice">
             <documentation>Update product special price</documentation>
-            <input message="typens:catalogProductSetSpecialPriceRequest" />
-            <output message="typens:catalogProductSetSpecialPriceResponse" />
+            <input message="typens:catalogProductSetSpecialPriceRequest"/>
+            <output message="typens:catalogProductSetSpecialPriceResponse"/>
         </operation>
         <operation name="catalogProductGetSpecialPrice">
             <documentation>Get product special price data</documentation>
-            <input message="typens:catalogProductGetSpecialPriceRequest" />
-            <output message="typens:catalogProductGetSpecialPriceResponse" />
+            <input message="typens:catalogProductGetSpecialPriceRequest"/>
+            <output message="typens:catalogProductGetSpecialPriceResponse"/>
         </operation>
         <operation name="catalogProductDelete">
             <documentation>Delete product</documentation>
-            <input message="typens:catalogProductDeleteRequest" />
-            <output message="typens:catalogProductDeleteResponse" />
+            <input message="typens:catalogProductDeleteRequest"/>
+            <output message="typens:catalogProductDeleteResponse"/>
         </operation>
         <operation name="catalogProductAttributeCurrentStore">
             <documentation>Set/Get current store view</documentation>
-            <input message="typens:catalogProductAttributeCurrentStoreRequest" />
-            <output message="typens:catalogProductAttributeCurrentStoreResponse" />
+            <input message="typens:catalogProductAttributeCurrentStoreRequest"/>
+            <output message="typens:catalogProductAttributeCurrentStoreResponse"/>
         </operation>
         <operation name="catalogProductAttributeList">
             <documentation>Retrieve attribute list</documentation>
-            <input message="typens:catalogProductAttributeListRequest" />
-            <output message="typens:catalogProductAttributeListResponse" />
+            <input message="typens:catalogProductAttributeListRequest"/>
+            <output message="typens:catalogProductAttributeListResponse"/>
         </operation>
         <operation name="catalogProductAttributeOptions">
             <documentation>Retrieve attribute options</documentation>
-            <input message="typens:catalogProductAttributeOptionsRequest" />
-            <output message="typens:catalogProductAttributeOptionsResponse" />
+            <input message="typens:catalogProductAttributeOptionsRequest"/>
+            <output message="typens:catalogProductAttributeOptionsResponse"/>
         </operation>
         <operation name="catalogProductAttributeSetList">
             <documentation>Retrieve product attribute sets</documentation>
-            <input message="typens:catalogProductAttributeSetListRequest" />
-            <output message="typens:catalogProductAttributeSetListResponse" />
+            <input message="typens:catalogProductAttributeSetListRequest"/>
+            <output message="typens:catalogProductAttributeSetListResponse"/>
         </operation>
         <operation name="catalogProductTypeList">
             <documentation>Retrieve product types</documentation>
-            <input message="typens:catalogProductTypeListRequest" />
-            <output message="typens:catalogProductTypeListResponse" />
+            <input message="typens:catalogProductTypeListRequest"/>
+            <output message="typens:catalogProductTypeListResponse"/>
         </operation>
         <operation name="catalogProductAttributeTierPriceInfo">
             <documentation>Retrieve product tier prices</documentation>
-            <input message="typens:catalogProductAttributeTierPriceInfoRequest" />
-            <output message="typens:catalogProductAttributeTierPriceInfoResponse" />
+            <input message="typens:catalogProductAttributeTierPriceInfoRequest"/>
+            <output message="typens:catalogProductAttributeTierPriceInfoResponse"/>
         </operation>
         <operation name="catalogProductAttributeTierPriceUpdate">
             <documentation>Update product tier prices</documentation>
-            <input message="typens:catalogProductAttributeTierPriceUpdateRequest" />
-            <output message="typens:catalogProductAttributeTierPriceUpdateResponse" />
+            <input message="typens:catalogProductAttributeTierPriceUpdateRequest"/>
+            <output message="typens:catalogProductAttributeTierPriceUpdateResponse"/>
         </operation>
         <operation name="catalogProductAttributeMediaCurrentStore">
             <documentation>Set/Get current store view</documentation>
-            <input message="typens:catalogProductAttributeMediaCurrentStoreRequest" />
-            <output message="typens:catalogProductAttributeMediaCurrentStoreResponse" />
+            <input message="typens:catalogProductAttributeMediaCurrentStoreRequest"/>
+            <output message="typens:catalogProductAttributeMediaCurrentStoreResponse"/>
         </operation>
         <operation name="catalogProductAttributeMediaList">
             <documentation>Retrieve product image list</documentation>
-            <input message="typens:catalogProductAttributeMediaListRequest" />
-            <output message="typens:catalogProductAttributeMediaListResponse" />
+            <input message="typens:catalogProductAttributeMediaListRequest"/>
+            <output message="typens:catalogProductAttributeMediaListResponse"/>
         </operation>
         <operation name="catalogProductAttributeMediaInfo">
             <documentation>Retrieve product image data</documentation>
-            <input message="typens:catalogProductAttributeMediaInfoRequest" />
-            <output message="typens:catalogProductAttributeMediaInfoResponse" />
+            <input message="typens:catalogProductAttributeMediaInfoRequest"/>
+            <output message="typens:catalogProductAttributeMediaInfoResponse"/>
         </operation>
         <operation name="catalogProductAttributeMediaTypes">
             <documentation>Retrieve product image types</documentation>
-            <input message="typens:catalogProductAttributeMediaTypesRequest" />
-            <output message="typens:catalogProductAttributeMediaTypesResponse" />
+            <input message="typens:catalogProductAttributeMediaTypesRequest"/>
+            <output message="typens:catalogProductAttributeMediaTypesResponse"/>
         </operation>
         <operation name="catalogProductAttributeMediaCreate">
             <documentation>Upload new product image</documentation>
-            <input message="typens:catalogProductAttributeMediaCreateRequest" />
-            <output message="typens:catalogProductAttributeMediaCreateResponse" />
+            <input message="typens:catalogProductAttributeMediaCreateRequest"/>
+            <output message="typens:catalogProductAttributeMediaCreateResponse"/>
         </operation>
         <operation name="catalogProductAttributeMediaUpdate">
             <documentation>Update product image</documentation>
-            <input message="typens:catalogProductAttributeMediaUpdateRequest" />
-            <output message="typens:catalogProductAttributeMediaUpdateResponse" />
+            <input message="typens:catalogProductAttributeMediaUpdateRequest"/>
+            <output message="typens:catalogProductAttributeMediaUpdateResponse"/>
         </operation>
         <operation name="catalogProductAttributeMediaRemove">
             <documentation>Remove product image</documentation>
-            <input message="typens:catalogProductAttributeMediaRemoveRequest" />
-            <output message="typens:catalogProductAttributeMediaRemoveResponse" />
+            <input message="typens:catalogProductAttributeMediaRemoveRequest"/>
+            <output message="typens:catalogProductAttributeMediaRemoveResponse"/>
         </operation>
         <operation name="catalogProductLinkList">
             <documentation>Retrieve linked products</documentation>
-            <input message="typens:catalogProductLinkListRequest" />
-            <output message="typens:catalogProductLinkListResponse" />
+            <input message="typens:catalogProductLinkListRequest"/>
+            <output message="typens:catalogProductLinkListResponse"/>
         </operation>
         <operation name="catalogProductLinkAssign">
             <documentation>Assign product link</documentation>
-            <input message="typens:catalogProductLinkAssignRequest" />
-            <output message="typens:catalogProductLinkAssignResponse" />
+            <input message="typens:catalogProductLinkAssignRequest"/>
+            <output message="typens:catalogProductLinkAssignResponse"/>
         </operation>
         <operation name="catalogProductLinkUpdate">
             <documentation>Update product link</documentation>
-            <input message="typens:catalogProductLinkUpdateRequest" />
-            <output message="typens:catalogProductLinkUpdateResponse" />
+            <input message="typens:catalogProductLinkUpdateRequest"/>
+            <output message="typens:catalogProductLinkUpdateResponse"/>
         </operation>
         <operation name="catalogProductLinkRemove">
             <documentation>Remove product link</documentation>
-            <input message="typens:catalogProductLinkRemoveRequest" />
-            <output message="typens:catalogProductLinkRemoveResponse" />
+            <input message="typens:catalogProductLinkRemoveRequest"/>
+            <output message="typens:catalogProductLinkRemoveResponse"/>
         </operation>
         <operation name="catalogProductLinkTypes">
             <documentation>Retrieve product link types</documentation>
-            <input message="typens:catalogProductLinkTypesRequest" />
-            <output message="typens:catalogProductLinkTypesResponse" />
+            <input message="typens:catalogProductLinkTypesRequest"/>
+            <output message="typens:catalogProductLinkTypesResponse"/>
         </operation>
         <operation name="catalogProductLinkAttributes">
             <documentation>Retrieve product link type attributes</documentation>
-            <input message="typens:catalogProductLinkAttributesRequest" />
-            <output message="typens:catalogProductLinkAttributesResponse" />
+            <input message="typens:catalogProductLinkAttributesRequest"/>
+            <output message="typens:catalogProductLinkAttributesResponse"/>
         </operation>
     </portType>
     <binding name="{{var wsdl.handler}}Binding" type="typens:{{var wsdl.handler}}PortType">
-        <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
+        <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
         <operation name="catalogCategoryCurrentStore">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogCategoryTree">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogCategoryLevel">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogCategoryInfo">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogCategoryCreate">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogCategoryUpdate">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogCategoryMove">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogCategoryDelete">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogCategoryAssignedProducts">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogCategoryAssignProduct">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogCategoryUpdateProduct">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogCategoryRemoveProduct">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductCurrentStore">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductList">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductInfo">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductCreate">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductUpdate">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductSetSpecialPrice">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductGetSpecialPrice">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductDelete">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductAttributeCurrentStore">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductAttributeList">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductAttributeOptions">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductAttributeSetList">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductTypeList">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductAttributeTierPriceInfo">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductAttributeTierPriceUpdate">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogCategoryAttributeCurrentStore">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogCategoryAttributeList">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogCategoryAttributeOptions">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductAttributeMediaCurrentStore">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductAttributeMediaList">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductAttributeMediaInfo">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductAttributeMediaTypes">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductAttributeMediaCreate">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductAttributeMediaUpdate">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductAttributeMediaRemove">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductLinkList">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductLinkAssign">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductLinkUpdate">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductLinkRemove">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductLinkTypes">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
         <operation name="catalogProductLinkAttributes">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
     </binding>
     <service name="{{var wsdl.name}}Service">
         <port name="{{var wsdl.handler}}Port" binding="typens:{{var wsdl.handler}}Binding">
-            <soap:address location="{{var wsdl.url}}" />
+            <soap:address location="{{var wsdl.url}}"/>
         </port>
     </service>
 </definitions>
diff --git a/app/code/core/Mage/Catalog/etc/wsi.xml b/app/code/core/Mage/Catalog/etc/wsi.xml
new file mode 100644
index 0000000000..642606cc51
--- /dev/null
+++ b/app/code/core/Mage/Catalog/etc/wsi.xml
@@ -0,0 +1,1926 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:typens="urn:{{var wsdl.name}}"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+             name="{{var wsdl.name}}"
+             targetNamespace="urn:{{var wsdl.name}}">
+    <wsdl:types>
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:{{var wsdl.name}}">
+            <xsd:complexType name="catalogProductEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogProductEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductEntity">
+                <xsd:sequence>
+                    <xsd:element name="product_id" type="xsd:string" />
+                    <xsd:element name="sku" type="xsd:string" />
+                    <xsd:element name="name" type="xsd:string" />
+                    <xsd:element name="set" type="xsd:string" />
+                    <xsd:element name="type" type="xsd:string" />
+                    <xsd:element name="category_ids" type="typens:ArrayOfString" />
+                    <xsd:element name="website_ids" type="typens:ArrayOfString" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductRequestAttributes">
+                <xsd:sequence>
+                    <xsd:element name="attributes" type="typens:ArrayOfString" minOccurs="0" />
+                    <xsd:element name="additional_attributes" type="typens:ArrayOfString" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductReturnEntity">
+                <xsd:sequence>
+                    <xsd:element name="product_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="sku" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="set" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="type" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="categories" type="typens:ArrayOfString" minOccurs="0" />
+                    <xsd:element name="websites" type="typens:ArrayOfString" minOccurs="0" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="type_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="name" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="description" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="short_description" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="weight" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="status" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="url_key" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="url_path" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="visibility" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="category_ids" type="typens:ArrayOfString" minOccurs="0" />
+                    <xsd:element name="website_ids" type="typens:ArrayOfString" minOccurs="0" />
+                    <xsd:element name="has_options" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="gift_message_available" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="price" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="special_price" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="special_from_date" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="special_to_date" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="tax_class_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="tier_price" type="typens:catalogProductTierPriceEntityArray" minOccurs="0" />
+                    <xsd:element name="meta_title" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="meta_keyword" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="meta_description" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="custom_design" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="custom_layout_update" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="options_container" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="additional_attributes" type="typens:associativeArray" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductCreateEntity">
+                <xsd:sequence>
+                    <xsd:element name="categories" type="typens:ArrayOfString" minOccurs="0" />
+                    <xsd:element name="websites" type="typens:ArrayOfString" minOccurs="0" />
+                    <xsd:element name="name" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="description" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="short_description" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="weight" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="status" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="url_key" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="url_path" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="visibility" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="category_ids" type="typens:ArrayOfString" minOccurs="0" />
+                    <xsd:element name="website_ids" type="typens:ArrayOfString" minOccurs="0" />
+                    <xsd:element name="has_options" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="gift_message_available" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="price" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="special_price" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="special_from_date" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="special_to_date" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="tax_class_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="tier_price" type="typens:catalogProductTierPriceEntityArray" minOccurs="0" />
+                    <xsd:element name="meta_title" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="meta_keyword" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="meta_description" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="custom_design" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="custom_layout_update" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="options_container" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="additional_attributes" type="typens:associativeArray" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductAttributeSetEntity">
+                <xsd:sequence>
+                    <xsd:element name="set_id" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="name" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductAttributeSetEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogProductAttributeSetEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductTypeEntity">
+                <xsd:sequence>
+                    <xsd:element name="type" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="label" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductTypeEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogProductTypeEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductTierPriceEntity">
+                <xsd:sequence>
+                    <xsd:element name="customer_group_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="website" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="qty" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="price" type="xsd:double" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductTierPriceEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogProductTierPriceEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="ArrayOfCatalogCategoryEntities">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogCategoryEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogCategoryEntity">
+                <xsd:sequence>
+                    <xsd:element name="category_id" type="xsd:int" />
+                    <xsd:element name="parent_id" type="xsd:int" />
+                    <xsd:element name="name" type="xsd:string" />
+                    <xsd:element name="is_active" type="xsd:int" />
+                    <xsd:element name="position" type="xsd:int" />
+                    <xsd:element name="level" type="xsd:int" />
+                    <xsd:element name="children" type="typens:ArrayOfCatalogCategoryEntities" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogCategoryEntityNoChildren">
+                <xsd:sequence>
+                    <xsd:element name="category_id" type="xsd:int" />
+                    <xsd:element name="parent_id" type="xsd:int" />
+                    <xsd:element name="name" type="xsd:string" />
+                    <xsd:element name="is_active" type="xsd:int" />
+                    <xsd:element name="position" type="xsd:int" />
+                    <xsd:element name="level" type="xsd:int" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="ArrayOfCatalogCategoryEntitiesNoChildren">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogCategoryEntityNoChildren" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogCategoryTree">
+                <xsd:sequence>
+                    <xsd:element name="category_id" type="xsd:int" />
+                    <xsd:element name="parent_id" type="xsd:int" />
+                    <xsd:element name="name" type="xsd:string" />
+                    <xsd:element name="position" type="xsd:int" />
+                    <xsd:element name="level" type="xsd:int" />
+                    <xsd:element name="children" type="typens:ArrayOfCatalogCategoryEntities" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogCategoryEntityCreate">
+                <xsd:sequence>
+                    <xsd:element name="name" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_active" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="position" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="available_sort_by" type="typens:ArrayOfString" minOccurs="0" />
+                    <xsd:element name="custom_design" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="custom_design_apply" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="custom_design_from" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="custom_design_to" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="custom_layout_update" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="default_sort_by" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="description" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="display_mode" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_anchor" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="landing_page" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="meta_description" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="meta_keywords" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="meta_title" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="page_layout" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="url_key" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="include_in_menu" type="xsd:int" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogCategoryInfo">
+                <xsd:sequence>
+                    <xsd:element name="category_id" type="xsd:string" />
+                    <xsd:element name="is_active" type="xsd:int" />
+                    <xsd:element name="position" type="xsd:string" />
+                    <xsd:element name="level" type="xsd:string" />
+                    <xsd:element name="parent_id" type="xsd:string" />
+                    <xsd:element name="all_children" type="xsd:string" />
+                    <xsd:element name="children" type="xsd:string" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="name" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="url_key" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="description" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="meta_title" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="meta_keywords" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="meta_description" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="path" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="url_path" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="children_count" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="display_mode" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_anchor" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="available_sort_by" type="typens:ArrayOfString" minOccurs="0" />
+                    <xsd:element name="custom_design" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="custom_design_apply" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="custom_design_from" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="custom_design_to" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="page_layout" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="custom_layout_update" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="default_sort_by" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="landing_page" type="xsd:int" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogAssignedProduct">
+                <xsd:sequence>
+                    <xsd:element name="product_id" type="xsd:int" />
+                    <xsd:element name="type" type="xsd:string" />
+                    <xsd:element name="set" type="xsd:int" />
+                    <xsd:element name="sku" type="xsd:string" />
+                    <xsd:element name="position" type="xsd:int" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogAssignedProductArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogAssignedProduct" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogAttributeEntity">
+                <xsd:sequence>
+                    <xsd:element name="attribute_id" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="type" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="required" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="scope" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogAttributeEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogAttributeEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogAttributeOptionEntity">
+                <xsd:sequence>
+                    <xsd:element name="label" type="xsd:string" />
+                    <xsd:element name="value" type="xsd:string" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogAttributeOptionEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogAttributeOptionEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductImageEntity">
+                <xsd:sequence>
+                    <xsd:element name="file" type="xsd:string" />
+                    <xsd:element name="label" type="xsd:string" />
+                    <xsd:element name="position" type="xsd:string" />
+                    <xsd:element name="exclude" type="xsd:string" />
+                    <xsd:element name="url" type="xsd:string" />
+                    <xsd:element name="types" type="typens:ArrayOfString" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductImageEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogProductImageEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductAttributeMediaTypeEntity">
+                <xsd:sequence>
+                    <xsd:element name="code" type="xsd:string" />
+                    <xsd:element name="scope" type="xsd:string" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductAttributeMediaTypeEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogProductAttributeMediaTypeEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductImageFileEntity">
+                <xsd:sequence>
+                    <xsd:element name="content" type="xsd:string" />
+                    <xsd:element name="mime" type="xsd:string" />
+                    <xsd:element name="name" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductAttributeMediaCreateEntity">
+                <xsd:sequence>
+                    <xsd:element name="file" type="typens:catalogProductImageFileEntity" minOccurs="0" />
+                    <xsd:element name="label" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="position" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="types" type="typens:ArrayOfString" minOccurs="0" />
+                    <xsd:element name="exclude" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="remove" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductLinkEntity">
+                <xsd:sequence>
+                    <xsd:element name="product_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="type" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="set" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="sku" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="position" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="qty" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductLinkEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogProductLinkEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductLinkAttributeEntity">
+                <xsd:sequence>
+                    <xsd:element name="code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="type" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductLinkAttributeEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogProductLinkAttributeEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+
+            <xsd:element name="catalogProductCurrentStoreRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductCurrentStoreResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="filters" type="typens:filters" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogProductEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductInfoRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="attributes" type="typens:catalogProductRequestAttributes" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductInfoResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogProductReturnEntity" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductCreateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="type" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="set" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sku" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productData" type="typens:catalogProductCreateEntity" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductCreateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductUpdateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productData" type="typens:catalogProductCreateEntity" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductUpdateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductSetSpecialPriceRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="specialPrice" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="fromDate" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="toDate" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductSetSpecialPriceResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductGetSpecialPriceRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductGetSpecialPriceResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogProductReturnEntity" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductDeleteRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductDeleteResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeCurrentStoreRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeCurrentStoreResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="setId" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogAttributeEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeOptionsRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="attributeId" type="xsd:int" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeOptionsResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogAttributeOptionEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeSetListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeSetListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogProductAttributeSetEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductTypeListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductTypeListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogProductTypeEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeTierPriceInfoRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeTierPriceInfoResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogProductTierPriceEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeTierPriceUpdateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="tierPrices" type="typens:catalogProductTierPriceEntityArray" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeTierPriceUpdateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeMediaCurrentStoreRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeMediaCurrentStoreResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeMediaListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeMediaListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogProductImageEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeMediaInfoRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="file" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeMediaInfoResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogProductImageEntity" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeMediaTypesRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="setId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeMediaTypesResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogProductAttributeMediaTypeEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeMediaCreateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="data" type="typens:catalogProductAttributeMediaCreateEntity" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeMediaCreateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeMediaUpdateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="file" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="data" type="typens:catalogProductAttributeMediaCreateEntity" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeMediaUpdateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeMediaRemoveRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="file" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductAttributeMediaRemoveResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductLinkListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="type" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductLinkListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogProductLinkEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductLinkAssignRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="type" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="linkedProductId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="data" type="typens:catalogProductLinkEntity" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductLinkAssignResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductLinkUpdateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="type" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="linkedProductId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="data" type="typens:catalogProductLinkEntity" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductLinkUpdateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductLinkRemoveRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="type" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="linkedProductId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductLinkRemoveResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductLinkTypesRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductLinkTypesResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:ArrayOfString" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductLinkAttributesRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="type" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogProductLinkAttributesResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogProductLinkAttributeEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryCurrentStoreRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryCurrentStoreResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryTreeRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="parentId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryTreeResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogCategoryTree" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryLevelRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="website" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="categoryId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryLevelResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:ArrayOfCatalogCategoryEntitiesNoChildren" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryInfoRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="categoryId" type="xsd:int" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="attributes" type="typens:ArrayOfString" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryInfoResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogCategoryInfo" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryCreateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="parentId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="categoryData" type="typens:catalogCategoryEntityCreate" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryCreateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryUpdateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="categoryId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="categoryData" type="typens:catalogCategoryEntityCreate" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryUpdateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryMoveRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="categoryId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="parentId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="afterId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryMoveResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryDeleteRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="categoryId" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryDeleteResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryAssignedProductsRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="categoryId" type="xsd:int" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryAssignedProductsResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogAssignedProductArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryAssignProductRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="categoryId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="position" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryAssignProductResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryUpdateProductRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="categoryId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="position" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryUpdateProductResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryRemoveProductRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="categoryId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="identifierType" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryRemoveProductResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryAttributeListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryAttributeListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogAttributeEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryAttributeOptionsRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="attributeId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryAttributeOptionsResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogAttributeOptionEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryAttributeCurrentStoreRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogCategoryAttributeCurrentStoreResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="catalogProductCurrentStoreRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductCurrentStoreRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductCurrentStoreResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductCurrentStoreResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductListRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductListResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductInfoRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductInfoRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductInfoResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductInfoResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductCreateRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductCreateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductCreateResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductCreateResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductUpdateRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductUpdateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductUpdateResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductUpdateResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductSetSpecialPriceRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductSetSpecialPriceRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductSetSpecialPriceResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductSetSpecialPriceResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductGetSpecialPriceRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductGetSpecialPriceRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductGetSpecialPriceResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductGetSpecialPriceResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductDeleteRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductDeleteRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductDeleteResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductDeleteResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeCurrentStoreRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeCurrentStoreRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeCurrentStoreResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeCurrentStoreResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeListRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeListResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeOptionsRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeOptionsRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeOptionsResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeOptionsResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeSetListRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeSetListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeSetListResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeSetListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductTypeListRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductTypeListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductTypeListResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductTypeListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeTierPriceInfoRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeTierPriceInfoRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeTierPriceInfoResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeTierPriceInfoResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeTierPriceUpdateRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeTierPriceUpdateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeTierPriceUpdateResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeTierPriceUpdateResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeMediaCurrentStoreRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeMediaCurrentStoreRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeMediaCurrentStoreResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeMediaCurrentStoreResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeMediaListRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeMediaListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeMediaListResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeMediaListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeMediaInfoRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeMediaInfoRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeMediaInfoResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeMediaInfoResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeMediaTypesRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeMediaTypesRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeMediaTypesResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeMediaTypesResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeMediaCreateRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeMediaCreateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeMediaCreateResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeMediaCreateResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeMediaUpdateRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeMediaUpdateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeMediaUpdateResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeMediaUpdateResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeMediaRemoveRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeMediaRemoveRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductAttributeMediaRemoveResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductAttributeMediaRemoveResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductLinkListRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductLinkListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductLinkListResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductLinkListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductLinkAssignRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductLinkAssignRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductLinkAssignResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductLinkAssignResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductLinkUpdateRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductLinkUpdateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductLinkUpdateResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductLinkUpdateResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductLinkRemoveRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductLinkRemoveRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductLinkRemoveResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductLinkRemoveResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductLinkTypesRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductLinkTypesRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductLinkTypesResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductLinkTypesResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductLinkAttributesRequest">
+        <wsdl:part name="parameters" element="typens:catalogProductLinkAttributesRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogProductLinkAttributesResponse">
+        <wsdl:part name="parameters" element="typens:catalogProductLinkAttributesResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryCurrentStoreRequest">
+        <wsdl:part name="parameters" element="typens:catalogCategoryCurrentStoreRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryCurrentStoreResponse">
+        <wsdl:part name="parameters" element="typens:catalogCategoryCurrentStoreResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryTreeRequest">
+        <wsdl:part name="parameters" element="typens:catalogCategoryTreeRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryTreeResponse">
+        <wsdl:part name="parameters" element="typens:catalogCategoryTreeResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryLevelRequest">
+        <wsdl:part name="parameters" element="typens:catalogCategoryLevelRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryLevelResponse">
+        <wsdl:part name="parameters" element="typens:catalogCategoryLevelResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryInfoRequest">
+        <wsdl:part name="parameters" element="typens:catalogCategoryInfoRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryInfoResponse">
+        <wsdl:part name="parameters" element="typens:catalogCategoryInfoResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryCreateRequest">
+        <wsdl:part name="parameters" element="typens:catalogCategoryCreateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryCreateResponse">
+        <wsdl:part name="parameters" element="typens:catalogCategoryCreateResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryUpdateRequest">
+        <wsdl:part name="parameters" element="typens:catalogCategoryUpdateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryUpdateResponse">
+        <wsdl:part name="parameters" element="typens:catalogCategoryUpdateResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryMoveRequest">
+        <wsdl:part name="parameters" element="typens:catalogCategoryMoveRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryMoveResponse">
+        <wsdl:part name="parameters" element="typens:catalogCategoryMoveResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryDeleteRequest">
+        <wsdl:part name="parameters" element="typens:catalogCategoryDeleteRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryDeleteResponse">
+        <wsdl:part name="parameters" element="typens:catalogCategoryDeleteResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryAssignedProductsRequest">
+        <wsdl:part name="parameters" element="typens:catalogCategoryAssignedProductsRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryAssignedProductsResponse">
+        <wsdl:part name="parameters" element="typens:catalogCategoryAssignedProductsResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryAssignProductRequest">
+        <wsdl:part name="parameters" element="typens:catalogCategoryAssignProductRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryAssignProductResponse">
+        <wsdl:part name="parameters" element="typens:catalogCategoryAssignProductResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryUpdateProductRequest">
+        <wsdl:part name="parameters" element="typens:catalogCategoryUpdateProductRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryUpdateProductResponse">
+        <wsdl:part name="parameters" element="typens:catalogCategoryUpdateProductResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryRemoveProductRequest">
+        <wsdl:part name="parameters" element="typens:catalogCategoryRemoveProductRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryRemoveProductResponse">
+        <wsdl:part name="parameters" element="typens:catalogCategoryRemoveProductResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryAttributeCurrentStoreRequest">
+        <wsdl:part name="parameters" element="typens:catalogCategoryAttributeCurrentStoreRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryAttributeCurrentStoreResponse">
+        <wsdl:part name="parameters" element="typens:catalogCategoryAttributeCurrentStoreResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryAttributeListRequest">
+        <wsdl:part name="parameters" element="typens:catalogCategoryAttributeListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryAttributeListResponse">
+        <wsdl:part name="parameters" element="typens:catalogCategoryAttributeListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryAttributeOptionsRequest">
+        <wsdl:part name="parameters" element="typens:catalogCategoryAttributeOptionsRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogCategoryAttributeOptionsResponse">
+        <wsdl:part name="parameters" element="typens:catalogCategoryAttributeOptionsResponseParam" />
+    </wsdl:message>
+    <wsdl:portType name="{{var wsdl.handler}}PortType">
+        <wsdl:operation name="catalogCategoryCurrentStore">
+            <wsdl:documentation>Set_Get current store view</wsdl:documentation>
+            <wsdl:input message="typens:catalogCategoryCurrentStoreRequest" />
+            <wsdl:output message="typens:catalogCategoryCurrentStoreResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryTree">
+            <wsdl:documentation>Retrieve hierarchical tree of categories.</wsdl:documentation>
+            <wsdl:input message="typens:catalogCategoryTreeRequest" />
+            <wsdl:output message="typens:catalogCategoryTreeResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryLevel">
+            <wsdl:documentation>Retrieve hierarchical tree of categories.</wsdl:documentation>
+            <wsdl:input message="typens:catalogCategoryLevelRequest" />
+            <wsdl:output message="typens:catalogCategoryLevelResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryInfo">
+            <wsdl:documentation>Retrieve hierarchical tree of categories.</wsdl:documentation>
+            <wsdl:input message="typens:catalogCategoryInfoRequest" />
+            <wsdl:output message="typens:catalogCategoryInfoResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryCreate">
+            <wsdl:documentation>Create new category and return its id.</wsdl:documentation>
+            <wsdl:input message="typens:catalogCategoryCreateRequest" />
+            <wsdl:output message="typens:catalogCategoryCreateResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryUpdate">
+            <wsdl:documentation>Update category</wsdl:documentation>
+            <wsdl:input message="typens:catalogCategoryUpdateRequest" />
+            <wsdl:output message="typens:catalogCategoryUpdateResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryMove">
+            <wsdl:documentation>Move category in tree</wsdl:documentation>
+            <wsdl:input message="typens:catalogCategoryMoveRequest" />
+            <wsdl:output message="typens:catalogCategoryMoveResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryDelete">
+            <wsdl:documentation>Delete category</wsdl:documentation>
+            <wsdl:input message="typens:catalogCategoryDeleteRequest" />
+            <wsdl:output message="typens:catalogCategoryDeleteResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryAssignedProducts">
+            <wsdl:documentation>Retrieve list of assigned products</wsdl:documentation>
+            <wsdl:input message="typens:catalogCategoryAssignedProductsRequest" />
+            <wsdl:output message="typens:catalogCategoryAssignedProductsResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryAssignProduct">
+            <wsdl:documentation>Assign product to category</wsdl:documentation>
+            <wsdl:input message="typens:catalogCategoryAssignProductRequest" />
+            <wsdl:output message="typens:catalogCategoryAssignProductResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryUpdateProduct">
+            <wsdl:documentation>Update assigned product</wsdl:documentation>
+            <wsdl:input message="typens:catalogCategoryUpdateProductRequest" />
+            <wsdl:output message="typens:catalogCategoryUpdateProductResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryRemoveProduct">
+            <wsdl:documentation>Remove product assignment from category</wsdl:documentation>
+            <wsdl:input message="typens:catalogCategoryRemoveProductRequest" />
+            <wsdl:output message="typens:catalogCategoryRemoveProductResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryAttributeCurrentStore">
+            <wsdl:documentation>Set/Get current store view</wsdl:documentation>
+            <wsdl:input message="typens:catalogCategoryAttributeCurrentStoreRequest" />
+            <wsdl:output message="typens:catalogCategoryAttributeCurrentStoreResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryAttributeList">
+            <wsdl:documentation>Retrieve category attributes</wsdl:documentation>
+            <wsdl:input message="typens:catalogCategoryAttributeListRequest" />
+            <wsdl:output message="typens:catalogCategoryAttributeListResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryAttributeOptions">
+            <wsdl:documentation>Retrieve attribute options</wsdl:documentation>
+            <wsdl:input message="typens:catalogCategoryAttributeOptionsRequest" />
+            <wsdl:output message="typens:catalogCategoryAttributeOptionsResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductCurrentStore">
+            <wsdl:documentation>Set/Get current store view</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductCurrentStoreRequest" />
+            <wsdl:output message="typens:catalogProductCurrentStoreResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductList">
+            <wsdl:documentation>Retrieve products list by filters</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductListRequest" />
+            <wsdl:output message="typens:catalogProductListResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductInfo">
+            <wsdl:documentation>Retrieve product</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductInfoRequest" />
+            <wsdl:output message="typens:catalogProductInfoResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductCreate">
+            <wsdl:documentation>Create new product and return product id</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductCreateRequest" />
+            <wsdl:output message="typens:catalogProductCreateResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductUpdate">
+            <wsdl:documentation>Update product</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductUpdateRequest" />
+            <wsdl:output message="typens:catalogProductUpdateResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductSetSpecialPrice">
+            <wsdl:documentation>Update product special price</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductSetSpecialPriceRequest" />
+            <wsdl:output message="typens:catalogProductSetSpecialPriceResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductGetSpecialPrice">
+            <wsdl:documentation>Get product special price data</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductGetSpecialPriceRequest" />
+            <wsdl:output message="typens:catalogProductGetSpecialPriceResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductDelete">
+            <wsdl:documentation>Delete product</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductDeleteRequest" />
+            <wsdl:output message="typens:catalogProductDeleteResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeCurrentStore">
+            <wsdl:documentation>Set/Get current store view</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductAttributeCurrentStoreRequest" />
+            <wsdl:output message="typens:catalogProductAttributeCurrentStoreResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeList">
+            <wsdl:documentation>Retrieve attribute list</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductAttributeListRequest" />
+            <wsdl:output message="typens:catalogProductAttributeListResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeOptions">
+            <wsdl:documentation>Retrieve attribute options</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductAttributeOptionsRequest" />
+            <wsdl:output message="typens:catalogProductAttributeOptionsResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeSetList">
+            <wsdl:documentation>Retrieve product attribute sets</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductAttributeSetListRequest" />
+            <wsdl:output message="typens:catalogProductAttributeSetListResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductTypeList">
+            <wsdl:documentation>Retrieve product types</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductTypeListRequest" />
+            <wsdl:output message="typens:catalogProductTypeListResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeTierPriceInfo">
+            <wsdl:documentation>Retrieve product tier prices</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductAttributeTierPriceInfoRequest" />
+            <wsdl:output message="typens:catalogProductAttributeTierPriceInfoResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeTierPriceUpdate">
+            <wsdl:documentation>Update product tier prices</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductAttributeTierPriceUpdateRequest" />
+            <wsdl:output message="typens:catalogProductAttributeTierPriceUpdateResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeMediaCurrentStore">
+            <wsdl:documentation>Set/Get current store view</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductAttributeMediaCurrentStoreRequest" />
+            <wsdl:output message="typens:catalogProductAttributeMediaCurrentStoreResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeMediaList">
+            <wsdl:documentation>Retrieve product image list</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductAttributeMediaListRequest" />
+            <wsdl:output message="typens:catalogProductAttributeMediaListResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeMediaInfo">
+            <wsdl:documentation>Retrieve product image data</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductAttributeMediaInfoRequest" />
+            <wsdl:output message="typens:catalogProductAttributeMediaInfoResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeMediaTypes">
+            <wsdl:documentation>Retrieve product image types</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductAttributeMediaTypesRequest" />
+            <wsdl:output message="typens:catalogProductAttributeMediaTypesResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeMediaCreate">
+            <wsdl:documentation>Upload new product image</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductAttributeMediaCreateRequest" />
+            <wsdl:output message="typens:catalogProductAttributeMediaCreateResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeMediaUpdate">
+            <wsdl:documentation>Update product image</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductAttributeMediaUpdateRequest" />
+            <wsdl:output message="typens:catalogProductAttributeMediaUpdateResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeMediaRemove">
+            <wsdl:documentation>Remove product image</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductAttributeMediaRemoveRequest" />
+            <wsdl:output message="typens:catalogProductAttributeMediaRemoveResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductLinkList">
+            <wsdl:documentation>Retrieve linked products</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductLinkListRequest" />
+            <wsdl:output message="typens:catalogProductLinkListResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductLinkAssign">
+            <wsdl:documentation>Assign product link</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductLinkAssignRequest" />
+            <wsdl:output message="typens:catalogProductLinkAssignResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductLinkUpdate">
+            <wsdl:documentation>Update product link</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductLinkUpdateRequest" />
+            <wsdl:output message="typens:catalogProductLinkUpdateResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductLinkRemove">
+            <wsdl:documentation>Remove product link</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductLinkRemoveRequest" />
+            <wsdl:output message="typens:catalogProductLinkRemoveResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductLinkTypes">
+            <wsdl:documentation>Retrieve product link types</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductLinkTypesRequest" />
+            <wsdl:output message="typens:catalogProductLinkTypesResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductLinkAttributes">
+            <wsdl:documentation>Retrieve product link type attributes</wsdl:documentation>
+            <wsdl:input message="typens:catalogProductLinkAttributesRequest" />
+            <wsdl:output message="typens:catalogProductLinkAttributesResponse" />
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="{{var wsdl.handler}}Binding" type="typens:{{var wsdl.handler}}PortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="catalogCategoryCurrentStore">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryTree">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryLevel">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryInfo">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryCreate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryUpdate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryMove">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryDelete">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryAssignedProducts">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryAssignProduct">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryUpdateProduct">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryRemoveProduct">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductCurrentStore">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductList">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductInfo">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductCreate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductUpdate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductSetSpecialPrice">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductGetSpecialPrice">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductDelete">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeCurrentStore">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeList">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeOptions">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeSetList">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductTypeList">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeTierPriceInfo">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeTierPriceUpdate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryAttributeCurrentStore">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryAttributeList">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogCategoryAttributeOptions">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeMediaCurrentStore">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeMediaList">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeMediaInfo">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeMediaTypes">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeMediaCreate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeMediaUpdate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductAttributeMediaRemove">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductLinkList">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductLinkAssign">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductLinkUpdate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductLinkRemove">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductLinkTypes">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogProductLinkAttributes">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="{{var wsdl.name}}Service">
+        <wsdl:port name="{{var wsdl.handler}}Port" binding="typens:{{var wsdl.handler}}Binding">
+            <soap:address location="{{var wsdl.url}}" />
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.43-1.4.0.0.44.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.43-1.4.0.0.44.php
new file mode 100644
index 0000000000..d2c48cdb46
--- /dev/null
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.43-1.4.0.0.44.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Catalog
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/* @var $installer Mage_Core_Model_Resource_Setup */
+$installer = $this;
+
+$connection = $installer->getConnection();
+$table      = $installer->getTable('catalog/category_product_indexer_idx');
+$connection->addKey($table, 'IDX_PRODUCT_CATEGORY_STORE', array('product_id', 'category_id', 'store_id'));
diff --git a/app/code/core/Mage/CatalogInventory/Model/Observer.php b/app/code/core/Mage/CatalogInventory/Model/Observer.php
index 33d2af10b4..f0d05cb32e 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Observer.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Observer.php
@@ -296,7 +296,11 @@ public function checkQuoteItemQty($observer)
                  */
                 $stockItem->setSuppressCheckQtyIncrements(true);
 
-                $qtyForCheck = $this->_getQuoteItemQtyForCheck($option->getProduct()->getId(), $quoteItem->getId(), $increaseOptionQty);
+                $qtyForCheck = $this->_getQuoteItemQtyForCheck(
+                    $option->getProduct()->getId(),
+                    $quoteItem->getId(),
+                    $increaseOptionQty
+                );
 
                 $result = $stockItem->checkQuoteItemQty($optionQty, $qtyForCheck, $option->getValue());
 
@@ -346,12 +350,20 @@ public function checkQuoteItemQty($observer)
                 /**
                  * we are using 0 because original qty was processed
                  */
-                $qtyForCheck = $this->_getQuoteItemQtyForCheck($quoteItem->getProduct()->getId(), $quoteItem->getId(), 0);
+                $qtyForCheck = $this->_getQuoteItemQtyForCheck(
+                    $quoteItem->getProduct()->getId(),
+                    $quoteItem->getId(),
+                    0
+                );
             }
             else {
                 $increaseQty = $quoteItem->getQtyToAdd() ? $quoteItem->getQtyToAdd() : $qty;
                 $rowQty = $qty;
-                $qtyForCheck = $this->_getQuoteItemQtyForCheck($quoteItem->getProduct()->getId(), $quoteItem->getId(), $increaseQty);
+                $qtyForCheck = $this->_getQuoteItemQtyForCheck(
+                    $quoteItem->getProduct()->getId(),
+                    $quoteItem->getId(),
+                    $increaseQty
+                );
             }
 
             $productTypeCustomOption = $quoteItem->getProduct()->getCustomOption('product_type');
@@ -544,7 +556,7 @@ protected function _addItemToQtyArray($quoteItem, &$items)
     }
 
     /**
-     * Prepare array with iformation about used product qty and product stock item
+     * Prepare array with information about used product qty and product stock item
      * result is:
      * array(
      *  $productId  => array(
@@ -812,7 +824,9 @@ public function createOrderItem($observer)
     public function refundOrderItem($observer)
     {
         $item = $observer->getEvent()->getCreditmemoItem();
-        if ($item->getId() && $item->getBackToStock() && ($productId = $item->getProductId()) && ($qty = $item->getQty())) {
+        if ($item->getId() && $item->getBackToStock() && ($productId = $item->getProductId())
+            && ($qty = $item->getQty())
+        ) {
             Mage::getSingleton('cataloginventory/stock')->backItemQty($productId, $qty);
         }
         return $this;
diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php
index fed80102b5..ccc3941f16 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php
@@ -461,6 +461,9 @@ public function addStockStatusToProducts($productCollection, $websiteId = null,
         }
         if ($websiteId === null) {
             $websiteId = Mage::app()->getStore()->getWebsiteId();
+            if ((int)$websiteId == 0 && $productCollection->getStoreId()) {
+                $websiteId = Mage::app()->getStore($productCollection->getStoreId())->getWebsiteId();
+            }
         }
         $productIds = array();
         foreach ($productCollection as $product) {
diff --git a/app/code/core/Mage/CatalogInventory/etc/wsi.xml b/app/code/core/Mage/CatalogInventory/etc/wsi.xml
new file mode 100644
index 0000000000..6812d85cb0
--- /dev/null
+++ b/app/code/core/Mage/CatalogInventory/etc/wsi.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:typens="urn:{{var wsdl.name}}"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+             name="{{var wsdl.name}}"
+             targetNamespace="urn:{{var wsdl.name}}">
+    <wsdl:types>
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:{{var wsdl.name}}">
+            <xsd:complexType name="catalogInventoryStockItemEntity">
+                <xsd:sequence>
+                    <xsd:element name="product_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="sku" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="qty" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_in_stock" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogInventoryStockItemEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogInventoryStockItemEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogInventoryStockItemUpdateEntity">
+                <xsd:sequence>
+                    <xsd:element name="qty" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_in_stock" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="manage_stock" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="use_config_manage_stock" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="min_qty" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="use_config_min_qty" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="min_sale_qty" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="use_config_min_sale_qty" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="max_sale_qty" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="use_config_max_sale_qty" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="is_qty_decimal" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="backorders" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="use_config_backorders" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="notify_stock_qty" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="use_config_notify_stock_qty" type="xsd:int" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="catalogProductCreateEntity">
+                <xsd:sequence>
+                    <xsd:element name="stock_data" type="typens:catalogInventoryStockItemUpdateEntity" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+
+
+            <xsd:element name="catalogInventoryStockItemListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productIds" type="typens:ArrayOfString" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogInventoryStockItemListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:catalogInventoryStockItemEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogInventoryStockItemUpdateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="data" type="typens:catalogInventoryStockItemUpdateEntity" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="catalogInventoryStockItemUpdateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="catalogInventoryStockItemListRequest">
+        <wsdl:part name="parameters" element="typens:catalogInventoryStockItemListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogInventoryStockItemListResponse">
+        <wsdl:part name="parameters" element="typens:catalogInventoryStockItemListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogInventoryStockItemUpdateRequest">
+        <wsdl:part name="parameters" element="typens:catalogInventoryStockItemUpdateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="catalogInventoryStockItemUpdateResponse">
+        <wsdl:part name="parameters" element="typens:catalogInventoryStockItemUpdateResponseParam" />
+    </wsdl:message>
+    <wsdl:portType name="{{var wsdl.handler}}PortType">
+        <wsdl:operation name="catalogInventoryStockItemList">
+            <wsdl:documentation>Retrieve stock data by product ids</wsdl:documentation>
+            <wsdl:input message="typens:catalogInventoryStockItemListRequest" />
+            <wsdl:output message="typens:catalogInventoryStockItemListResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="catalogInventoryStockItemUpdate">
+            <wsdl:documentation>Update product stock data</wsdl:documentation>
+            <wsdl:input message="typens:catalogInventoryStockItemUpdateRequest" />
+            <wsdl:output message="typens:catalogInventoryStockItemUpdateResponse" />
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="{{var wsdl.handler}}Binding" type="typens:{{var wsdl.handler}}PortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="catalogInventoryStockItemList">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="catalogInventoryStockItemUpdate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="{{var wsdl.name}}Service">
+        <wsdl:port name="{{var wsdl.handler}}Port" binding="typens:{{var wsdl.handler}}Binding">
+            <soap:address location="{{var wsdl.url}}" />
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
diff --git a/app/code/core/Mage/CatalogRule/Helper/Data.php b/app/code/core/Mage/CatalogRule/Helper/Data.php
index 6b95d9983a..d429e00429 100644
--- a/app/code/core/Mage/CatalogRule/Helper/Data.php
+++ b/app/code/core/Mage/CatalogRule/Helper/Data.php
@@ -39,6 +39,7 @@ class Mage_CatalogRule_Helper_Data extends Mage_Core_Helper_Abstract
      */
     public function calcPriceRule ($actionOperator, $ruleAmount, $price)
     {
+        $priceRule = 0;
         switch ($actionOperator) {
             case 'to_fixed':
                 $priceRule = $ruleAmount;
@@ -53,6 +54,6 @@ public function calcPriceRule ($actionOperator, $ruleAmount, $price)
                 $priceRule = $price * (1 - $ruleAmount / 100);
                 break;
         }
-        return max($priceRule, 0);
+        return $priceRule;
     }
 }
diff --git a/app/code/core/Mage/CatalogRule/Model/Rule.php b/app/code/core/Mage/CatalogRule/Model/Rule.php
index abf7e493fc..cf9a884ba0 100644
--- a/app/code/core/Mage/CatalogRule/Model/Rule.php
+++ b/app/code/core/Mage/CatalogRule/Model/Rule.php
@@ -286,7 +286,12 @@ public function calcProductPriceRule(Mage_Catalog_Model_Product $product, $price
         $productId       = $product->getId();
         $storeId         = $product->getStoreId();
         $websiteId       = Mage::app()->getStore($storeId)->getWebsiteId();
-        $customerGroupId = Mage::getSingleton('customer/session')->getCustomerGroupId();
+        $customerGroupId = null;
+        if ($product->hasCustomerGroupId()) {
+            $customerGroupId = $product->getCustomerGroupId();
+        } else {
+            $customerGroupId = Mage::getSingleton('customer/session')->getCustomerGroupId();
+        }
         $dateTs          = Mage::app()->getLocale()->storeTimeStamp($storeId);
         $cacheKey        = date('Y-m-d', $dateTs)."|$websiteId|$customerGroupId|$productId|$price";
 
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php
index 29dd1ca1b0..cbae791168 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php
@@ -132,7 +132,7 @@ protected function _rebuildStoreIndex($storeId, $productIds = null)
     {
         $this->cleanIndex($storeId, $productIds);
 
-        // preparesearchable attributes
+        // prepare searchable attributes
         $staticFields   = array();
         foreach ($this->_getSearchableAttributes('static') as $attribute) {
             $staticFields[] = $attribute->getAttributeCode();
@@ -188,7 +188,11 @@ protected function _rebuildStoreIndex($storeId, $productIds = null)
                 }
 
                 $protductAttr = $productAttributes[$productData['entity_id']];
-                if (!isset($protductAttr[$visibility->getId()]) || !in_array($protductAttr[$visibility->getId()], $visibilityVals)) {
+                if (!isset($protductAttr[$visibility->getId()])
+                    || (!in_array($protductAttr[$visibility->getId()], $visibilityVals)
+                        && !$this->_engine->allowAdvancedIndex()
+                    )
+                ) {
                     continue;
                 }
                 if (!isset($protductAttr[$status->getId()]) || !in_array($protductAttr[$status->getId()], $statusVals)) {
@@ -259,8 +263,7 @@ protected function _getSearchableProducts($storeId, array $staticFields, $produc
         $result = $this->_getWriteAdapter()->fetchAll($select);
         if ($this->_engine && $this->_engine->allowAdvancedIndex() && count($result) > 0) {
             return $this->_engine->addAdvancedIndex($result, $storeId, $productIds);
-        }
-        else {
+        } else {
             return $result;
         }
     }
@@ -652,7 +655,7 @@ protected function _getAttributeValue($attributeId, $value, $storeId)
             $value = implode($this->_separator, $value);
         }
 
-        return preg_replace("#\s+#si", ' ', trim(strip_tags($value)));
+        return preg_replace("#\s+#siu", ' ', trim(strip_tags($value)));
     }
 
     /**
diff --git a/app/code/core/Mage/CatalogSearch/Model/Query.php b/app/code/core/Mage/CatalogSearch/Model/Query.php
index b4fccb8739..ffe7b315f5 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Query.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Query.php
@@ -208,7 +208,7 @@ public function getMinQueryLength(){
      */
     public function getMaxQueryLenght()
     {
-        return Mage::getStoreConfig(self::XML_PATH_MAX_QUERY_LENGTH, $this->getStoreId());
+        return 0;
     }
 
     /**
@@ -218,7 +218,7 @@ public function getMaxQueryLenght()
      */
     public function getMaxQueryLength()
     {
-        return $this->getMaxQueryLenght();
+        return Mage::getStoreConfig(self::XML_PATH_MAX_QUERY_LENGTH, $this->getStoreId());
     }
 
     /**
diff --git a/app/code/core/Mage/Checkout/Model/Api/Resource.php b/app/code/core/Mage/Checkout/Model/Api/Resource.php
index b683b95f66..b47a5957c9 100644
--- a/app/code/core/Mage/Checkout/Model/Api/Resource.php
+++ b/app/code/core/Mage/Checkout/Model/Api/Resource.php
@@ -154,7 +154,8 @@ protected function _getStoreIdFromQuote($quoteId)
      *
      * @param array $data
      * @param Mage_Core_Model_Abstract $object
-     * @param array $attributes
+     * @param string $type
+     * @param array|null $attributes
      * @return Mage_Checkout_Model_Api_Resource
      */
     protected function _updateAttributes($data, $object, $type,  array $attributes = null)
@@ -172,6 +173,7 @@ protected function _updateAttributes($data, $object, $type,  array $attributes =
      * Retrieve entity attributes values
      *
      * @param Mage_Core_Model_Abstract $object
+     * @param string $type
      * @param array $attributes
      * @return Mage_Checkout_Model_Api_Resource
      */
@@ -210,7 +212,7 @@ protected function _getAttributes($object, $type, array $attributes = null)
      * Check is attribute allowed to usage
      *
      * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute
-     * @param string $entityType
+     * @param string $type
      * @param array $attributes
      * @return bool
      */
diff --git a/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php b/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php
index c83dabea5d..ae685915d4 100644
--- a/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php
+++ b/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php
@@ -72,7 +72,7 @@ protected function _getCustomerAddress($addressId)
     {
         $address = Mage::getModel('customer/address')->load((int)$addressId);
         if (is_null($address->getId())) {
-            $this->_fault('invalid_address_data');
+            $this->_fault('invalid_address_id');
         }
 
         $address->explodeStreetAddress();
diff --git a/app/code/core/Mage/Checkout/Model/Api/Resource/Product.php b/app/code/core/Mage/Checkout/Model/Api/Resource/Product.php
index 7adb3dc747..543aef23d7 100644
--- a/app/code/core/Mage/Checkout/Model/Api/Resource/Product.php
+++ b/app/code/core/Mage/Checkout/Model/Api/Resource/Product.php
@@ -25,7 +25,7 @@
  */
 
 /**
- * ${CLASS_DESCRIPTION}
+ * API Resource class for product
  */
 class Mage_Checkout_Model_Api_Resource_Product extends Mage_Checkout_Model_Api_Resource
 {
@@ -41,31 +41,15 @@ class Mage_Checkout_Model_Api_Resource_Product extends Mage_Checkout_Model_Api_R
      *
      * @param  int|string $productId (SKU or ID)
      * @param  int|string $store
+     * @param  string $identifierType
      * @return Mage_Catalog_Model_Product
      */
     protected function _getProduct($productId, $store = null, $identifierType = null)
     {
-        $loadByIdOnFalse = false;
-        if ($identifierType == null) {
-            $identifierType = 'sku';
-            $loadByIdOnFalse = true;
-        }
-        $product = Mage::getModel('catalog/product');
-        if ($store !== null) {
-            $product->setStoreId($this->_getStoreId($store));
-        }
-        /* @var $product Mage_Catalog_Model_Product */
-        if ($identifierType == 'sku') {
-            $idBySku = $product->getIdBySku($productId);
-            if ($idBySku) {
-                $productId = $idBySku;
-            }
-            if ($idBySku || $loadByIdOnFalse) {
-                $product->load($productId);
-            }
-        } elseif ($identifierType == 'id') {
-            $product->load($productId);
-        }
+        $product = Mage::helper('catalog/product')->getProduct($productId,
+                        $this->_getStoreId($store),
+                        $identifierType
+        );
         return $product;
     }
 
@@ -91,4 +75,54 @@ protected function _getProductRequest($requestInfo)
         }
         return $request;
     }
+
+    /**
+     * Get QuoteItem by Product and request info
+     *
+     * @param Mage_Sales_Model_Quote $quote
+     * @param Mage_Catalog_Model_Product $product
+     * @param Varien_Object $requestInfo
+     * @return Mage_Sales_Model_Quote_Item
+     * @throw Mage_Core_Exception
+     */
+    protected function _getQuoteItemByProduct(Mage_Sales_Model_Quote $quote,
+                            Mage_Catalog_Model_Product $product,
+                            Varien_Object $requestInfo)
+    {
+        $cartCandidates = $product->getTypeInstance(true)
+                        ->prepareForCartAdvanced($requestInfo,
+                                $product,
+                                Mage_Catalog_Model_Product_Type_Abstract::PROCESS_MODE_FULL
+        );
+
+        /**
+         * Error message
+         */
+        if (is_string($cartCandidates)) {
+            throw Mage::throwException($cartCandidates);
+        }
+
+        /**
+         * If prepare process return one object
+         */
+        if (!is_array($cartCandidates)) {
+            $cartCandidates = array($cartCandidates);
+        }
+
+        /** @var $item Mage_Sales_Model_Quote_Item */
+        $item = null;
+        foreach ($cartCandidates as $candidate) {
+            if ($candidate->getParentProductId()) {
+                continue;
+            }
+
+            $item = $quote->getItemByProduct($candidate);
+        }
+
+        if (is_null($item)) {
+            $item = Mage::getModel("sales/quote_item");
+        }
+
+        return $item;
+    }
 }
diff --git a/app/code/core/Mage/Checkout/Model/Cart.php b/app/code/core/Mage/Checkout/Model/Cart.php
index 42b01964b6..f94b64621a 100644
--- a/app/code/core/Mage/Checkout/Model/Cart.php
+++ b/app/code/core/Mage/Checkout/Model/Cart.php
@@ -111,7 +111,7 @@ public function init()
         $this->getQuote()->setCheckoutMethod('');
 
         /**
-         * If user try do checkout, reset shipiing and payment data
+         * If user try do checkout, reset shipping and payment data
          */
         if ($this->getCheckoutSession()->getCheckoutState() !== Mage_Checkout_Model_Session::CHECKOUT_STATE_BEGIN) {
             $this->getQuote()
@@ -168,13 +168,20 @@ public function addOrderItem($orderItem, $qtyFlag=null)
      */
     protected function _getProduct($productInfo)
     {
+        $product = null;
         if ($productInfo instanceof Mage_Catalog_Model_Product) {
             $product = $productInfo;
         } elseif (is_int($productInfo) || is_string($productInfo)) {
             $product = Mage::getModel('catalog/product')
                 ->setStoreId(Mage::app()->getStore()->getId())
                 ->load($productInfo);
-        } else {
+        }
+        $currentWebsiteId = Mage::app()->getStore()->getWebsiteId();
+        if (!$product
+            || !$product->getId()
+            || !is_array($product->getWebsiteIds())
+            || !in_array($currentWebsiteId, $product->getWebsiteIds())
+        ) {
             Mage::throwException(Mage::helper('checkout')->__('The product could not be found.'));
         }
         return $product;
@@ -276,9 +283,7 @@ public function addProductsByIds($productIds)
                 if (!$productId) {
                     continue;
                 }
-                $product = Mage::getModel('catalog/product')
-                    ->setStoreId(Mage::app()->getStore()->getId())
-                    ->load($productId);
+                $product = $this->_getProduct($productId);
                 if ($product->getId() && $product->isVisibleInCatalog()) {
                     try {
                         $this->getQuote()->addProduct($product);
@@ -376,6 +381,9 @@ public function updateItems($data)
             $qty = isset($itemInfo['qty']) ? (float) $itemInfo['qty'] : false;
             if ($qty > 0) {
                 $item->setQty($qty);
+                if ($item->getHasError()) {
+                    Mage::throwException($item->getMessage());
+                }
 
                 if (isset($itemInfo['before_suggest_qty']) && ($itemInfo['before_suggest_qty'] != $qty)) {
                     $qtyRecalculatedFlag = true;
@@ -545,7 +553,10 @@ public function updateItem($itemId, $requestInfo = null, $updatingParams = null)
             Mage::throwException($result);
         }
 
-        Mage::dispatchEvent('checkout_cart_product_update_after', array('quote_item' => $result, 'product' => $product));
+        Mage::dispatchEvent('checkout_cart_product_update_after', array(
+            'quote_item' => $result,
+            'product' => $product
+        ));
         $this->getCheckoutSession()->setLastAddedProductId($productId);
         return $result;
     }
diff --git a/app/code/core/Mage/Checkout/Model/Cart/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Api.php
index 9ce7d751f8..4cb7245996 100644
--- a/app/code/core/Mage/Checkout/Model/Cart/Api.php
+++ b/app/code/core/Mage/Checkout/Model/Cart/Api.php
@@ -47,7 +47,6 @@ public function __construct()
      * Create new quote for shopping cart
      *
      * @param int|string $store
-     * @param int $quoteId
      * @return int
      */
     public function create($store = null)
@@ -58,9 +57,9 @@ public function create($store = null)
             /*@var $quote Mage_Sales_Model_Quote*/
             $quote = Mage::getModel('sales/quote');
             $quote->setStoreId($storeId)
-                ->setIsActive(false)
-                ->setIsMultiShipping(false)
-                ->save();
+                    ->setIsActive(false)
+                    ->setIsMultiShipping(false)
+                    ->save();
         } catch (Mage_Core_Exception $e) {
             $this->_fault('create_quote_fault', $e->getMessage());
         }
@@ -86,11 +85,10 @@ public function info($quoteId, $store = null)
 
         $result = $this->_getAttributes($quote, 'quote');
         $result['shipping_address'] = $this->_getAttributes($quote->getShippingAddress(), 'quote_address');
-        $result['billing_address']  = $this->_getAttributes($quote->getBillingAddress(), 'quote_address');
+        $result['billing_address'] = $this->_getAttributes($quote->getBillingAddress(), 'quote_address');
         $result['items'] = array();
 
         foreach ($quote->getAllItems() as $item) {
-
             if ($item->getGiftMessageId() > 0) {
                 $item->setGiftMessage(
                     Mage::getSingleton('giftmessage/message')->load($item->getGiftMessageId())->getMessage()
@@ -101,7 +99,7 @@ public function info($quoteId, $store = null)
         }
 
         $result['payment'] = $this->_getAttributes($quote->getPayment(), 'quote_payment');
-        
+
         return $result;
     }
 
@@ -117,7 +115,7 @@ public function totals($quoteId, $store = null)
         $totals = $quote->getTotals();
 
         $totalsResult = array();
-        foreach( $totals as $total) {
+        foreach ($totals as $total) {
             $totalsResult[] = array(
                 "title" => $total->getTitle(),
                 "amount" => $total->getValue()
@@ -127,14 +125,19 @@ public function totals($quoteId, $store = null)
     }
 
     /**
+     * Create an order from the shopping cart (quote)
+     *
      * @param  $quoteId
      * @param  $store
-     * @return void
+     * @param  $agreements array
+     * @return string
      */
     public function createOrder($quoteId, $store = null, $agreements = null)
     {
-        if ($requiredAgreements = Mage::helper('checkout')->getRequiredAgreementIds()) {
-            if ($diff = array_diff($agreements, $requiredAgreements)) {
+        $requiredAgreements = Mage::helper('checkout')->getRequiredAgreementIds();
+        if (!empty($requiredAgreements)) {
+            $diff = array_diff($agreements, $requiredAgreements);
+            if (!empty($diff)) {
                 $this->_fault('required_agreements_are_not_all');
             }
         }
@@ -143,15 +146,18 @@ public function createOrder($quoteId, $store = null, $agreements = null)
         if ($quote->getIsMultiShipping()) {
             $this->_fault('invalid_checkout_type');
         }
-        if ($quote->getCheckoutMethod() == Mage_Checkout_Model_Api_Resource_Customer::MODE_GUEST && !Mage::helper('checkout')->isAllowedGuestCheckout($quote, $quote->getStoreId())) {
+        if ($quote->getCheckoutMethod() == Mage_Checkout_Model_Api_Resource_Customer::MODE_GUEST
+                && !Mage::helper('checkout')->isAllowedGuestCheckout($quote, $quote->getStoreId())) {
             $this->_fault('guest_checkout_is_not_enabled');
         }
 
+        /** @var $customerResource Mage_Checkout_Model_Api_Resource_Customer */
         $customerResource = Mage::getModel("checkout/api_resource_customer");
         $isNewCustomer = $customerResource->prepareCustomerForQuote($quote);
 
         try {
             $quote->collectTotals();
+            /** @var $service Mage_Sales_Model_Service_Quote */
             $service = Mage::getModel('sales/service_quote', $quote);
             $service->submitAll();
 
@@ -165,24 +171,25 @@ public function createOrder($quoteId, $store = null, $agreements = null)
 
             $order = $service->getOrder();
             if ($order) {
-                Mage::dispatchEvent('checkout_type_onepage_save_order_after', array('order'=>$order, 'quote'=>$quote));
-                
+                Mage::dispatchEvent('checkout_type_onepage_save_order_after',
+                    array('order' => $order, 'quote' => $quote));
+
                 try {
                     $order->sendNewOrderEmail();
                 } catch (Exception $e) {
                     Mage::logException($e);
                 }
             }
-            
+
             Mage::dispatchEvent(
                 'checkout_submit_all_after',
                 array('order' => $order, 'quote' => $quote)
             );
-        } catch( Mage_Core_Exception $e) {
+        } catch (Mage_Core_Exception $e) {
             $this->_fault('create_order_fault', $e->getMessage());
         }
 
-        return true;
+        return $order->getIncrementId();
     }
 
     /**
@@ -198,8 +205,8 @@ public function licenseAgreement($quoteId, $store = null)
         $agreements = array();
         if (Mage::getStoreConfigFlag('checkout/options/enable_agreements')) {
             $agreementsCollection = Mage::getModel('checkout/agreement')->getCollection()
-                ->addStoreFilter($storeId)
-                ->addFieldToFilter('is_active', 1);
+                    ->addStoreFilter($storeId)
+                    ->addFieldToFilter('is_active', 1);
 
             foreach ($agreementsCollection as $_a) {
                 /** @var $_a  Mage_Checkout_Model_Agreement */
diff --git a/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php
index c64dccaff7..3221863d22 100644
--- a/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php
+++ b/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php
@@ -79,7 +79,7 @@ protected function _applyCoupon($quoteId, $couponCode, $store = null)
         $quote = $this->_getQuote($quoteId, $store);
 
         if (!$quote->getItemsCount()) {
-            return false;
+            $this->_fault('quote_is_empty');
         }
 
         $oldCouponCode = $quote->getCouponCode();
@@ -100,8 +100,6 @@ protected function _applyCoupon($quoteId, $couponCode, $store = null)
             if (!$couponCode == $quote->getCouponCode()) {
                 $this->_fault('coupon_code_is_not_valid');
             }
-        } else {
-            $this->_fault('coupon_code_was_canceled');
         }
 
         return true;
diff --git a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php
index d8bff99a25..a0cdc5abf3 100644
--- a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php
+++ b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php
@@ -112,7 +112,7 @@ public function setAddresses($quoteId, $customerAddressData, $store = null)
 
         $customerAddressData = $this->_prepareCustomerAddressData($customerAddressData);
         if (is_null($customerAddressData)) {
-            $this->_fault('customer_address_data_invalid');
+            $this->_fault('customer_address_data_empty');
         }
         
         foreach ($customerAddressData as $addressItem) {
@@ -132,7 +132,7 @@ public function setAddresses($quoteId, $customerAddressData, $store = null)
             if (!empty($addressItem['entity_id'])) {
                 $customerAddress = $this->_getCustomerAddress($addressItem['entity_id']);
                 if ($customerAddress->getCustomerId() != $quote->getCustomerId()) {
-                    $this->_fault('customer_address_invalid');
+                    $this->_fault('address_not_belong_customer');
                 }
                 $address->importCustomerAddress($customerAddress);
 
diff --git a/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php
index 2a0236bd3d..188fb6431c 100644
--- a/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php
+++ b/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php
@@ -134,20 +134,25 @@ public function getPaymentMethodsList($quoteId, $store=null)
     public function setPaymentMethod($quoteId, $paymentData, $store=null)
     {
         $quote = $this->_getQuote($quoteId, $store);
-
-        // check if billing or shipping addresses are set
-        if (is_null($quote->getBillingAddress()->getId()) ) {
-            $this->_fault('billing_address_is_not_set');
-        }
-        if (is_null($quote->getShippingAddress()->getId()) ) {
-            $this->_fault('shipping_address_is_not_set');
-        }
+        $store = $quote->getStoreId();
 
         $paymentData = $this->_preparePaymentData($paymentData);
 
+        if (empty($paymentData)) {
+            $this->_fault("payment_method_empty");
+        }
+
         if ($quote->isVirtual()) {
+            // check if billing address is set
+            if (is_null($quote->getBillingAddress()->getId()) ) {
+                $this->_fault('billing_address_is_not_set');
+            }
             $quote->getBillingAddress()->setPaymentMethod(isset($paymentData['method']) ? $paymentData['method'] : null);
         } else {
+            // check if shipping address is set
+            if (is_null($quote->getShippingAddress()->getId()) ) {
+                $this->_fault('shipping_address_is_not_set');
+            }
             $quote->getShippingAddress()->setPaymentMethod(isset($paymentData['method']) ? $paymentData['method'] : null);
         }
 
@@ -155,6 +160,20 @@ public function setPaymentMethod($quoteId, $paymentData, $store=null)
             $quote->getShippingAddress()->setCollectShippingRates(true);
         }
 
+        $total = $quote->getBaseSubtotal();
+        $methods = Mage::helper('payment')->getStoreMethods($store, $quote);
+        foreach ($methods as $key=>$method) {
+            if ($method->getCode() == $paymentData['method']) {
+                /** @var $method Mage_Payment_Model_Method_Abstract */
+                if (!($this->_canUsePaymentMethod($method, $quote)
+                        && ($total != 0
+                            || $method->getCode() == 'free'
+                            || ($quote->hasRecurringItems() && $method->canManageRecurringProfiles())))) {
+                    $this->_fault("method_not_allowed");
+                }
+            }
+        }
+
         try {
             $payment = $quote->getPayment();
             $payment->importData($paymentData);
diff --git a/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php
index 99b2d28637..751fc203d5 100644
--- a/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php
+++ b/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php
@@ -1,299 +1,329 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Mage
- * @package     Mage_Checkout
- * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Shopping cart api for product
- *
- * @category    Mage
- * @package     Mage_Checkout
- * @author      Magento Core Team <core@magentocommerce.com>
- */
-
-class Mage_Checkout_Model_Cart_Product_Api extends Mage_Checkout_Model_Api_Resource_Product
-{
-    protected function _prepareProductsData($data)
-    {
-        if (!is_array($data)) {
-            return null;
-        }
-
-        $_data = array();
-        if (is_array($data) && is_null($data[0])) {
-            $_data[] = $data;
-        } else {
-            $_data = $data;
-        }
-
-        return $_data;
-    }
-
-    /**
-     * @param  $quoteId
-     * @param  $productsData
-     * @param  $store
-     * @return bool
-     */
-    public function add($quoteId, $productsData, $store=null)
-    {
-        $quote = $this->_getQuote($quoteId, $store);
-        if (empty($store)) {
-            $store = $quote->getStoreId();
-        }
-
-        $productsData = $this->_prepareProductsData($productsData);
-        if (empty($productsData)) {
-            $this->_fault('invalid_product_data');
-        }
-
-        $errors = array();
-        foreach ($productsData as $productItem) {
-            if (isset($productItem['product_id'])) {
-                $productByItem = $this->_getProduct($productItem['product_id'], $store, "id");
-            } else if (isset($productItem['sku'])) {
-                $productByItem = $this->_getProduct($productItem['sku'], $store, "sku");
-            } else {
-                continue;
-            }
-
-            $productRequest = $this->_getProductRequest($productItem);
-            try {
-                $result = $quote->addProduct($productByItem, $productRequest);
-                if (is_string($result)) {
-                    Mage::throwException($result);
-                }
-            } catch( Exception $e) {
-                $errors[] = $e->getMessage();
-            }
-        }
-
-        if (!empty($errors)) {
-            $this->_fault("add_product_fault", implode(PHP_EOL, $errors));
-        }
-
-        try {
-            $quote->collectTotals()->save();
-        } catch(Exception $e) {
-            $this->_fault("add_product_fault", $e->getMessage());
-        }
-
-        return true;
-    }
-
-    /**
-     * @param  $quoteId
-     * @param  $productsData
-     * @param  $store
-     * @return bool
-     */
-    public function update($quoteId, $productsData, $store=null)
-    {
-        $quote = $this->_getQuote($quoteId, $store);
-        if (empty($store)) {
-            $store = $quote->getStoreId();
-        }
-
-        $productsData = $this->_prepareProductsData($productsData);
-        if (empty($productsData)) {
-            $this->_fault('invalid_product_data');
-        }
-
-        foreach ($productsData as $productItem) {
-            if (isset($productItem['product_id'])) {
-                $productByItem = $this->_getProduct($productItem['product_id'], $store, "id");
-            } else if (isset($productItem['sku'])) {
-                $productByItem = $this->_getProduct($productItem['sku'], $store, "sku");
-            } else {
-                continue;
-            }
-
-            /** @var $quoteItem Mage_Sales_Model_Quote_Item */
-            $quoteItem = $quote->getItemByProduct($productByItem);
-            if ($quoteItem === false) {
-                continue;
-            }
-
-            if ($productItem['qty'] > 0) {
-                $quoteItem->setQty($productItem['qty']);
-            }
-        }
-
-        try {
-            $quote->save();
-        } catch(Exception $e) {
-            $this->_fault("update_product_fault", $e->getMessage());
-        }
-
-        return true;
-    }
-
-    /**
-     * @param  $quoteId
-     * @param  $productsData
-     * @param  $store
-     * @return bool
-     */
-    public function remove($quoteId, $productsData, $store=null)
-    {
-        $quote = $this->_getQuote($quoteId, $store);
-        if (empty($store)) {
-            $store = $quote->getStoreId();
-        }
-
-        $productsData = $this->_prepareProductsData($productsData);
-        if (empty($productsData)) {
-            $this->_fault('invalid_product_data');
-        }
-
-        foreach ($productsData as $productItem) {
-            if (isset($productItem['product_id'])) {
-                $productByItem = $this->_getProduct($productItem['product_id'], $store, "id");
-            } else if (isset($productItem['sku'])) {
-                $productByItem = $this->_getProduct($productItem['sku'], $store, "sku");
-            } else {
-                continue;
-            }
-
-            /** @var $quoteItem Mage_Sales_Model_Quote_Item */
-            $quoteItem = $quote->getItemByProduct($productByItem);
-            if ($quoteItem === false) {
-                continue;
-            }
-
-            $quote->removeItem($quoteItem->getId());
-        }
-
-        try {
-            $quote->save();
-        } catch(Exception $e) {
-            $this->_fault("remove_product_fault", $e->getMessage());
-        }
-
-        return true;
-    }
-
-    /**
-     * @param  $quoteId
-     * @param  $store
-     * @return array
-     */
-    public function items($quoteId, $store = null)
-    {
-        $quote = $this->_getQuote($quoteId, $store);
-        if (empty($store)) {
-            $store = $quote->getStoreId();
-        }
-
-        if (!$quote->getItemsCount()) {
-            return array();
-        }
-
-        $productsResult = array();
-        foreach ($quote->getAllItems() as $item) {
-            /** @var $item Mage_Sales_Model_Quote_Item */
-            $product = $item->getProduct();
-            $productsResult[] = array( // Basic product data
-                'product_id' => $product->getId(),
-                'sku'        => $product->getSku(),
-                'set'        => $product->getAttributeSetId(),
-                'type'       => $product->getTypeId(),
-                'categories' => $product->getCategoryIds(),
-                'websites'   => $product->getWebsiteIds()
-            );
-        }
-
-        return $productsResult;
-    }
-
-    /**
-     * @param  $quoteId
-     * @param  $productsData
-     * @param  $store
-     * @return bool
-     */
-    public function moveToCustomerQuote($quoteId, $productsData, $store=null)
-    {
-        $quote = $this->_getQuote($quoteId, $store);
-
-        if (empty($store)) {
-            $store = $quote->getStoreId();
-        }
-
-        $customer = $quote->getCustomer();
-        if (is_null($customer->getId())) {
-            $this->_fault('customer_not_set_for_quote');
-        }
-
-        /** @var $customerQuote Mage_Sales_Model_Quote */
-        $customerQuote = Mage::getModel('sales/quote')
-            ->setStoreId($store)
-            ->loadByCustomer($customer);
-
-        if (is_null($customerQuote->getId())) {
-            $this->_fault('customer_quote_not_exist');
-        }
-
-        if ($customerQuote->getId() == $quote->getId()) {
-            $this->_fault('quotes_are_similar');
-        }
-
-        $productsData = $this->_prepareProductsData($productsData);
-
-        foreach($productsData as $key => $productItem){
-            if (isset($productItem['product_id'])) {
-                $productByItem = $this->_getProduct($productItem['product_id'], $store, "id");
-            } else if (isset($productItem['sku'])) {
-                $productByItem = $this->_getProduct($productItem['sku'], $store, "sku");
-            } else {
-                continue;
-            }
-
-            $quoteItem = $quote->getItemByProduct($productByItem);
-            if($quoteItem->getId()){
-                $customerQuote->addItem($quoteItem);
-                $quote->removeItem($quoteItem->getId());
-                unset($productsData[$key]);
-            }
-        }
-
-        if (count($productsData)) {
-            $this->_fault('unable_to_move_all_products');
-        }
-
-        try {
-            $customerQuote
-                ->collectTotals()
-                ->save();
-
-            $quote
-                ->collectTotals()
-                ->save();
-        } catch (Exception $e) {
-             $this->_fault($e->getMessage(), $e->getMessage());
-        }
-
-        return true;
-    }
-}
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Checkout
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Shopping cart api for product
+ *
+ * @category    Mage
+ * @package     Mage_Checkout
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+
+class Mage_Checkout_Model_Cart_Product_Api extends Mage_Checkout_Model_Api_Resource_Product
+{
+    protected function _prepareProductsData($data)
+    {
+        if (!is_array($data)) {
+            return null;
+        }
+
+        $_data = array();
+        if (is_array($data) && is_null($data[0])) {
+            $_data[] = $data;
+        } else {
+            $_data = $data;
+        }
+
+        return $_data;
+    }
+
+    /**
+     * @param  $quoteId
+     * @param  $productsData
+     * @param  $store
+     * @return bool
+     */
+    public function add($quoteId, $productsData, $store=null)
+    {
+        $quote = $this->_getQuote($quoteId, $store);
+        if (empty($store)) {
+            $store = $quote->getStoreId();
+        }
+
+        $productsData = $this->_prepareProductsData($productsData);
+        if (empty($productsData)) {
+            $this->_fault('invalid_product_data');
+        }
+
+        $errors = array();
+        foreach ($productsData as $productItem) {
+            if (isset($productItem['product_id'])) {
+                $productByItem = $this->_getProduct($productItem['product_id'], $store, "id");
+            } else if (isset($productItem['sku'])) {
+                $productByItem = $this->_getProduct($productItem['sku'], $store, "sku");
+            } else {
+                $errors[] = Mage::helper('checkout')->__("One item of products do not have identifier or sku");
+                continue;
+            }
+
+            $productRequest = $this->_getProductRequest($productItem);
+            try {
+                $result = $quote->addProduct($productByItem, $productRequest);
+                if (is_string($result)) {
+                    Mage::throwException($result);
+                }
+            } catch (Mage_Core_Exception $e) {
+                $errors[] = $e->getMessage();
+            }
+        }
+
+        if (!empty($errors)) {
+            $this->_fault("add_product_fault", implode(PHP_EOL, $errors));
+        }
+
+        try {
+            $quote->collectTotals()->save();
+        } catch(Exception $e) {
+            $this->_fault("add_product_quote_save_fault", $e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @param  $quoteId
+     * @param  $productsData
+     * @param  $store
+     * @return bool
+     */
+    public function update($quoteId, $productsData, $store=null)
+    {
+        $quote = $this->_getQuote($quoteId, $store);
+        if (empty($store)) {
+            $store = $quote->getStoreId();
+        }
+
+        $productsData = $this->_prepareProductsData($productsData);
+        if (empty($productsData)) {
+            $this->_fault('invalid_product_data');
+        }
+
+        $errors = array();
+        foreach ($productsData as $productItem) {
+            if (isset($productItem['product_id'])) {
+                $productByItem = $this->_getProduct($productItem['product_id'], $store, "id");
+            } else if (isset($productItem['sku'])) {
+                $productByItem = $this->_getProduct($productItem['sku'], $store, "sku");
+            } else {
+                $errors[] = Mage::helper('checkout')->__("One item of products do not have identifier or sku");
+                continue;
+            }
+
+            /** @var $quoteItem Mage_Sales_Model_Quote_Item */
+            $quoteItem = $this->_getQuoteItemByProduct($quote, $productByItem, $this->_getProductRequest($productItem));
+            if (is_null($quoteItem->getId())) {
+                $errors[] = Mage::helper('checkout')->__("One item of products is not belong any of quote item");
+                continue;
+            }
+
+            if ($productItem['qty'] > 0) {
+                $quoteItem->setQty($productItem['qty']);
+            }
+        }
+
+        if (!empty($errors)) {
+            $this->_fault("update_product_fault", implode(PHP_EOL, $errors));
+        }
+
+        try {
+            $quote->save();
+        } catch(Exception $e) {
+            $this->_fault("update_product_quote_save_fault", $e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @param  $quoteId
+     * @param  $productsData
+     * @param  $store
+     * @return bool
+     */
+    public function remove($quoteId, $productsData, $store=null)
+    {
+        $quote = $this->_getQuote($quoteId, $store);
+        if (empty($store)) {
+            $store = $quote->getStoreId();
+        }
+
+        $productsData = $this->_prepareProductsData($productsData);
+        if (empty($productsData)) {
+            $this->_fault('invalid_product_data');
+        }
+
+        $errors = array();
+        foreach ($productsData as $productItem) {
+            if (isset($productItem['product_id'])) {
+                $productByItem = $this->_getProduct($productItem['product_id'], $store, "id");
+            } else if (isset($productItem['sku'])) {
+                $productByItem = $this->_getProduct($productItem['sku'], $store, "sku");
+            } else {
+                $errors[] = Mage::helper('checkout')->__("One item of products do not have identifier or sku");
+                continue;
+            }
+
+            try {
+                /** @var $quoteItem Mage_Sales_Model_Quote_Item */
+                $quoteItem = $this->_getQuoteItemByProduct($quote, $productByItem, $this->_getProductRequest($productItem));
+                if (is_null($quoteItem->getId())) {
+                    $errors[] = Mage::helper('checkout')->__("One item of products is not belong any of quote item");
+                    continue;
+                }
+                $quote->removeItem($quoteItem->getId());
+            } catch (Mage_Core_Exception $e) {
+                $errors[] = $e->getMessage();
+            }
+        }
+
+        if (!empty($errors)) {
+            $this->_fault("remove_product_fault", implode(PHP_EOL, $errors));
+        }
+
+        try {
+            $quote->save();
+        } catch(Exception $e) {
+            $this->_fault("remove_product_quote_save_fault", $e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @param  $quoteId
+     * @param  $store
+     * @return array
+     */
+    public function items($quoteId, $store = null)
+    {
+        $quote = $this->_getQuote($quoteId, $store);
+        if (empty($store)) {
+            $store = $quote->getStoreId();
+        }
+
+        if (!$quote->getItemsCount()) {
+            return array();
+        }
+
+        $productsResult = array();
+        foreach ($quote->getAllItems() as $item) {
+            /** @var $item Mage_Sales_Model_Quote_Item */
+            $product = $item->getProduct();
+            $productsResult[] = array( // Basic product data
+                'product_id' => $product->getId(),
+                'sku'        => $product->getSku(),
+                'set'        => $product->getAttributeSetId(),
+                'type'       => $product->getTypeId(),
+                'categories' => $product->getCategoryIds(),
+                'websites'   => $product->getWebsiteIds()
+            );
+        }
+
+        return $productsResult;
+    }
+
+    /**
+     * @param  $quoteId
+     * @param  $productsData
+     * @param  $store
+     * @return bool
+     */
+    public function moveToCustomerQuote($quoteId, $productsData, $store=null)
+    {
+        $quote = $this->_getQuote($quoteId, $store);
+
+        if (empty($store)) {
+            $store = $quote->getStoreId();
+        }
+
+        $customer = $quote->getCustomer();
+        if (is_null($customer->getId())) {
+            $this->_fault('customer_not_set_for_quote');
+        }
+
+        /** @var $customerQuote Mage_Sales_Model_Quote */
+        $customerQuote = Mage::getModel('sales/quote')
+            ->setStoreId($store)
+            ->loadByCustomer($customer);
+
+        if (is_null($customerQuote->getId())) {
+            $this->_fault('customer_quote_not_exist');
+        }
+
+        if ($customerQuote->getId() == $quote->getId()) {
+            $this->_fault('quotes_are_similar');
+        }
+
+        $productsData = $this->_prepareProductsData($productsData);
+        if (empty($productsData)) {
+            $this->_fault('invalid_product_data');
+        }
+
+        $errors = array();
+        foreach($productsData as $key => $productItem){
+            if (isset($productItem['product_id'])) {
+                $productByItem = $this->_getProduct($productItem['product_id'], $store, "id");
+            } else if (isset($productItem['sku'])) {
+                $productByItem = $this->_getProduct($productItem['sku'], $store, "sku");
+            } else {
+                $errors[] = Mage::helper('checkout')->__("One item of products do not have identifier or sku");
+                continue;
+            }
+
+            try {
+                /** @var $quoteItem Mage_Sales_Model_Quote_Item */
+                $quoteItem = $this->_getQuoteItemByProduct($quote, $productByItem, $this->_getProductRequest($productItem));
+                if($quoteItem->getId()){
+                    $customerQuote->addItem($quoteItem);
+                    $quote->removeItem($quoteItem->getId());
+                    unset($productsData[$key]);
+                } else {
+                     $errors[] = Mage::helper('checkout')->__("One item of products is not belong any of quote item");
+                }
+            } catch (Mage_Core_Exception $e) {
+                $errors[] = $e->getMessage();
+            }
+        }
+
+        if (count($productsData) || !empty($errors)) {
+            $this->_fault('unable_to_move_all_products', implode(PHP_EOL, $errors));
+        }
+
+        try {
+            $customerQuote
+                ->collectTotals()
+                ->save();
+
+            $quote
+                ->collectTotals()
+                ->save();
+        } catch (Exception $e) {
+             $this->_fault("product_move_quote_save_fault", $e->getMessage());
+        }
+
+        return true;
+    }
+}
diff --git a/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php
index e7a5fa0bf0..ff0d53da65 100644
--- a/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php
+++ b/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php
@@ -35,82 +35,42 @@
 class Mage_Checkout_Model_Cart_Product_Api_V2 extends Mage_Checkout_Model_Cart_Product_Api
 {
 
-    protected function _prepareProductsData($data)
-    {
-        if (!is_array($data) && !is_object($data)) {
-            return null;
-        }
-
-        $_data = array();
+    /**
+     * Return an Array of Object attributes.
+     *
+     * @param Mixed $data
+     * @return Array
+     */
+    protected function _prepareProductsData($data){
         if (is_object($data)) {
-            $dataItem = $data;
-            $dataItem = $this->_checkBundleOptions($dataItem);
-            $dataItem = $this->_checkOptions($dataItem);
-            $_data[] = get_object_vars($data);
-        } else {
-            foreach ($data as $_dataItem) {
-                $dataItem = $_dataItem;
-                $dataItem = $this->_checkBundleOptions($dataItem);
-                $dataItem = $this->_checkOptions($dataItem);
-                $_data[] = get_object_vars($dataItem);
-            }
-        }
-
-        return parent::_prepareProductsData($_data);
-    }
-
-    protected function _checkBundleOptions($dataItem)
-    {
-        if (!isset($dataItem->bundle_options) || !isset($dataItem->bundle_options_qty)) {
-            return $dataItem;
-        }
-
-        if (isset($dataItem->bundle_options)) {
-            $options = array();
-            foreach($dataItem->bundle_options as $option) {
-                if (is_object($option)) {
-                    $options[$option->key] = $option->value;
-                } else {
-                    foreach($option as $key=>$value) {
-                        $options[$key] = $value;
+            $arr = get_object_vars($data);
+            foreach ($arr as $key => $value) {
+                $assocArr = array();
+                if (is_array($value)) {
+                    foreach ($value as $v) {
+                        if (is_object($v) && count(get_object_vars($v))==2
+                            && isset($v->key) && isset($v->value)) {
+                            $assocArr[$v->key] = $v->value;
+                        }
                     }
                 }
-            }
-            $dataItem->bundle_options = $options;
-        }
-
-        if (isset($dataItem->bundle_options_qty)) {
-            $options_qty = array();
-            foreach($dataItem->bundle_options_qty as $option) {
-                if (is_object($option)) {
-                    $options[$option->key] = $option->value;
-                } else {
-                    foreach($option as $key=>$value) {
-                        $options[$key] = $value;
-                    }
+                if (!empty($assocArr)) {
+                    $arr[$key] = $assocArr;
                 }
             }
-            $dataItem->bundle_options_qty = $options_qty;
+            $arr = $this->_prepareData($arr);
+            return parent::_prepareData($arr);
         }
-        return $dataItem;
-    }
-
-    protected function _checkOptions($dataItem)
-    {
-        if (isset($dataItem->options)) {
-            $options = array();
-            foreach($dataItem->options as $option) {
-                if (is_object($option)) {
-                    $options[$option->key] = $option->value;
+        if (is_array($data)) {
+            foreach ($data as $key => $value) {
+                if (is_object($value) || is_array($value)) {
+                    $data[$key] = $this->_prepareData($value);
                 } else {
-                    foreach($option as $key=>$value) {
-                        $options[$key] = $value;
-                    }
+                    $data[$key] = $value;
                 }
-
             }
-            $dataItem->options = $options;
+            return parent::_prepareData($data);
         }
-        return $dataItem;
+        return $data;
     }
 }
diff --git a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php
index a617749aca..84463bba45 100644
--- a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php
+++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php
@@ -415,6 +415,8 @@ protected function _prepareOrder(Mage_Sales_Model_Quote_Address $address)
         $quote = $this->getQuote();
         $quote->unsReservedOrderId();
         $quote->reserveOrderId();
+        $quote->collectTotals();
+
         $convertQuote = Mage::getSingleton('sales/convert_quote');
         $order = $convertQuote->addressToOrder($address);
         $order->setBillingAddress(
diff --git a/app/code/core/Mage/Checkout/controllers/CartController.php b/app/code/core/Mage/Checkout/controllers/CartController.php
index a3abaaf30c..0689acc93f 100644
--- a/app/code/core/Mage/Checkout/controllers/CartController.php
+++ b/app/code/core/Mage/Checkout/controllers/CartController.php
@@ -317,6 +317,9 @@ public function updateItemOptionsAction()
             if (is_string($item)) {
                 Mage::throwException($item);
             }
+            if ($item->getHasError()) {
+                Mage::throwException($item->getMessage());
+            }
 
             $related = $this->getRequest()->getParam('related_product');
             if (!empty($related)) {
diff --git a/app/code/core/Mage/Checkout/controllers/MultishippingController.php b/app/code/core/Mage/Checkout/controllers/MultishippingController.php
index 873e7c6c1c..cf4895c060 100644
--- a/app/code/core/Mage/Checkout/controllers/MultishippingController.php
+++ b/app/code/core/Mage/Checkout/controllers/MultishippingController.php
@@ -503,19 +503,22 @@ public function overviewPostAction()
             }
             $this->_redirect('*/*/billing');
         } catch (Mage_Checkout_Exception $e) {
-            Mage::helper('checkout')->sendPaymentFailedEmail($this->_getCheckout()->getQuote(), $e->getMessage(), 'multi-shipping');
+            Mage::helper('checkout')
+                ->sendPaymentFailedEmail($this->_getCheckout()->getQuote(), $e->getMessage(), 'multi-shipping');
             $this->_getCheckout()->getCheckoutSession()->clear();
             $this->_getCheckoutSession()->addError($e->getMessage());
             $this->_redirect('*/cart');
         }
         catch (Mage_Core_Exception $e){
-            Mage::helper('checkout')->sendPaymentFailedEmail($this->_getCheckout()->getQuote(), $e->getMessage(), 'multi-shipping');
+            Mage::helper('checkout')
+                ->sendPaymentFailedEmail($this->_getCheckout()->getQuote(), $e->getMessage(), 'multi-shipping');
             $this->_getCheckoutSession()->addError($e->getMessage());
             $this->_redirect('*/*/billing');
-        }
-        catch (Exception $e){
-            Mage::helper('checkout')->sendPaymentFailedEmail($this->_getCheckout()->getQuote(), $e->getMessage(), 'multi-shipping');
-            $this->_getCheckoutSession()->addError('Order place error.');
+        } catch (Exception $e){
+            Mage::logException($e);
+            Mage::helper('checkout')
+                ->sendPaymentFailedEmail($this->_getCheckout()->getQuote(), $e->getMessage(), 'multi-shipping');
+            $this->_getCheckoutSession()->addError($this->__('Order place error.'));
             $this->_redirect('*/*/billing');
         }
     }
diff --git a/app/code/core/Mage/Checkout/controllers/OnepageController.php b/app/code/core/Mage/Checkout/controllers/OnepageController.php
index 7783698d62..8c2b2282bc 100644
--- a/app/code/core/Mage/Checkout/controllers/OnepageController.php
+++ b/app/code/core/Mage/Checkout/controllers/OnepageController.php
@@ -371,7 +371,9 @@ public function saveShippingMethodAction()
             $result will have erro data if shipping method is empty
             */
             if(!$result) {
-                Mage::dispatchEvent('checkout_controller_onepage_save_shipping_method', array('request'=>$this->getRequest(), 'quote'=>$this->getOnepage()->getQuote()));
+                Mage::dispatchEvent('checkout_controller_onepage_save_shipping_method',
+                        array('request'=>$this->getRequest(),
+                            'quote'=>$this->getOnepage()->getQuote()));
                 $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
 
                 $result['goto_section'] = 'payment';
@@ -432,6 +434,44 @@ public function savePaymentAction()
         $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
     }
 
+    /* @var $_order Mage_Sales_Model_Order */
+    protected $_order;
+
+    /**
+     * Get Order by quoteId
+     *
+     * @return Mage_Sales_Model_Order
+     */
+    protected function _getOrder()
+    {
+        if (is_null($this->_order)) {
+            $this->_order = Mage::getModel('sales/order')->load($this->getOnepage()->getQuote()->getId(), 'quote_id');
+            if (!$this->_order->getId()) {
+                throw new Mage_Payment_Model_Info_Exception(Mage::helper('core')->__("Can not create invoice. Order was not found."));
+            }
+        }
+        return $this->_order;
+    }
+
+    /**
+     * Create invoice
+     *
+     * @return Mage_Sales_Model_Order_Invoice
+     */
+    protected function _initInvoice()
+    {
+        $items = array();
+        foreach ($this->getOnepage()->getQuote()->getAllItems() as $item) {
+            $items[$item->getId()] = $item->getQty();
+        }
+        /* @var $invoice Mage_Sales_Model_Service_Order */
+        $invoice = Mage::getModel('sales/service_order', $this->_getOrder())->prepareInvoice($items);
+        $invoice->setEmailSent(true);
+
+        Mage::register('current_invoice', $invoice);
+        return $invoice;
+    }
+
     /**
      * Create order action
      */
@@ -457,6 +497,19 @@ public function saveOrderAction()
                 $this->getOnepage()->getQuote()->getPayment()->importData($data);
             }
             $this->getOnepage()->saveOrder();
+
+            $storeId = Mage::app()->getStore()->getId();
+            $paymentHelper = Mage::helper("payment");
+            $zeroSubTotalPaymentAction = $paymentHelper->getZeroSubTotalPaymentAutomaticInvoice($storeId);
+            if ($paymentHelper->isZeroSubTotal($storeId)
+                    && $this->_getOrder()->getGrandTotal() == 0
+                    && $zeroSubTotalPaymentAction == Mage_Payment_Model_Method_Abstract::ACTION_AUTHORIZE_CAPTURE
+                    && $paymentHelper->getZeroSubTotalOrderStatus($storeId) == 'pending') {
+                $invoice = $this->_initInvoice();
+                $invoice->getOrder()->setIsInProcess(true);
+                $invoice->save();
+            }
+
             $redirectUrl = $this->getOnepage()->getCheckout()->getRedirectUrl();
             $result['success'] = true;
             $result['error']   = false;
diff --git a/app/code/core/Mage/Checkout/etc/api.xml b/app/code/core/Mage/Checkout/etc/api.xml
index 211096e4c8..f336ba941d 100644
--- a/app/code/core/Mage/Checkout/etc/api.xml
+++ b/app/code/core/Mage/Checkout/etc/api.xml
@@ -70,17 +70,33 @@
                     </quote_not_exists>
                     <quote_create_fault>
                         <code>1003</code>
-                        <message>Can not create a quote</message>
+                        <message>Can not create a quote. </message>
                     </quote_create_fault>
                     <quote_already_exists>
                         <code>1004</code>
                         <message>Can not create a quote because quote with such identifier is already exists</message>
                     </quote_already_exists>
+                    <required_agreements_are_not_all>
+                        <code>1005</code>
+                        <message>You did not set all required agreements</message>
+                    </required_agreements_are_not_all>
+                    <invalid_checkout_type>
+                        <code>1006</code>
+                        <message>The checkout type is not valid. Select single checkout type.</message>
+                    </invalid_checkout_type>
+                    <guest_checkout_is_not_enabled>
+                        <code>1007</code>
+                        <message>Checkout is not available for guest</message>
+                    </guest_checkout_is_not_enabled>
+                    <create_order_fault>
+                        <code>1008</code>
+                        <message>Can not create an order. </message>
+                    </create_order_fault>
                 </faults>
             </cart>
             <cart_product translate="title" module="checkout">
                 <model>checkout/cart_product_api</model>
-                <title>Cart Product Api</title>
+                <title>Cart Product API</title>
                 <acl>cart/product</acl>
                 <methods>
                     <add translate="title" module="checkout">
@@ -110,14 +126,62 @@
                     </moveToCustomerQuote>
                 </methods>
                 <faults module="checkout">
+                    <store_not_exists>
+                        <code>1001</code>
+                        <message>Can not make operation because store is not exists</message>
+                    </store_not_exists>
+                    <quote_not_exists>
+                        <code>1002</code>
+                        <message>Can not make operation because quote is not exists</message>
+                    </quote_not_exists>
+                    <invalid_product_data>
+                        <code>1021</code>
+                        <message>Product's data is not valid.</message>
+                    </invalid_product_data>
                     <add_product_fault>
-                        <code>1011</code>
-                        <message>Error occurred during adding product in cart:</message>
-                    </add_product_fault>
-                    <add_product_fault>
-                        <code>1011</code>
-                        <message>Error occurred during adding product in cart:</message>
+                        <code>1022</code>
+                        <message>Product(s) could not be added. </message>
                     </add_product_fault>
+                    <add_product_quote_save_fault>
+                        <code>1023</code>
+                        <message>Quote could not be saved during adding product(s) operation.</message>
+                    </add_product_quote_save_fault>
+                    <update_product_fault>
+                        <code>1024</code>
+                        <message>Product(s) could not be updated. </message>
+                    </update_product_fault>
+                    <update_product_quote_save_fault>
+                        <code>1025</code>
+                        <message>Quote could not be saved during updating product(s) operation.</message>
+                    </update_product_quote_save_fault>
+                    <remove_product_fault>
+                        <code>1026</code>
+                        <message>Product(s) could not be removed. </message>
+                    </remove_product_fault>
+                    <remove_product_quote_save_fault>
+                        <code>1027</code>
+                        <message>Quote could not be saved during removing product(s) operation.</message>
+                    </remove_product_quote_save_fault>
+                    <customer_not_set_for_quote>
+                        <code>1028</code>
+                        <message>Customer is not set for quote.</message>
+                    </customer_not_set_for_quote>
+                    <customer_quote_not_exist>
+                        <code>1029</code>
+                        <message>Customer's quote is not existed.</message>
+                    </customer_quote_not_exist>
+                    <quotes_are_similar>
+                        <code>1030</code>
+                        <message>Quotes are identical.</message>
+                    </quotes_are_similar>
+                    <unable_to_move_all_products>
+                        <code>1031</code>
+                        <message>Product(s) could not be moved. </message>
+                    </unable_to_move_all_products>
+                    <product_move_quote_save_fault>
+                        <code>1032</code>
+                        <message>One of quote could not be saved during moving product(s) operation.</message>
+                    </product_move_quote_save_fault>
                 </faults>
             </cart_product>
             <cart_customer translate="title" module="checkout">
@@ -137,38 +201,54 @@
                     </addresses>
                 </methods>
                 <faults module="checkout">
+                    <store_not_exists>
+                        <code>1001</code>
+                        <message>Can not make operation because store is not exists</message>
+                    </store_not_exists>
+                    <quote_not_exists>
+                        <code>1002</code>
+                        <message>Can not make operation because quote is not exists</message>
+                    </quote_not_exists>
                     <customer_not_set>
-                        <code>1101</code>
-                        <message>Customer not set</message>
+                        <code>1041</code>
+                        <message>Customer is not set. </message>
                     </customer_not_set>
                     <customer_not_exists>
-                        <code>1102</code>
-                        <message>customer_not_exists</message>
+                        <code>1042</code>
+                        <message>The customer's identifier is not valid or customer is not existed</message>
                     </customer_not_exists>
                     <customer_not_created>
-                        <code>1103</code>
-                        <message>customer_not_created</message>
+                        <code>1043</code>
+                        <message>Customer could not be created. </message>
                     </customer_not_created>
                     <customer_data_invalid>
-                        <code>1104</code>
-                        <message>customer_data_invalid</message>
+                        <code>1044</code>
+                        <message>Customer data is not valid. </message>
                     </customer_data_invalid>
-                    <customer_address_data_invalid>
-                        <code>1151</code>
-                        <message>customer_address_data_invalid</message>
-                    </customer_address_data_invalid>
+                    <customer_mode_is_unknown>
+                        <code>1045</code>
+                        <message>Customer's mode is unknown</message>
+                    </customer_mode_is_unknown>
+                    <customer_address_data_empty>
+                        <code>1051</code>
+                        <message>Customer address data is empty.</message>
+                    </customer_address_data_empty>
                     <customer_address_invalid>
-                        <code>1152</code>
-                        <message>customer_address_invalid</message>
+                        <code>1052</code>
+                        <message>Customer's address data is not valid.</message>
                     </customer_address_invalid>
-                    <invalid_address_data>
-                        <code>1153</code>
-                        <message>invalid_address_data</message>
-                    </invalid_address_data>
+                    <invalid_address_id>
+                        <code>1053</code>
+                        <message>The customer's address identifier is not valid</message>
+                    </invalid_address_id>
                     <address_is_not_set>
-                        <code>1154</code>
-                        <message>address_is_not_set</message>
+                        <code>1054</code>
+                        <message>Customer address is not set.</message>
                     </address_is_not_set>
+                    <address_not_belong_customer>
+                        <code>1055</code>
+                        <message>Customer address identifier do not belong customer, which set in quote</message>
+                    </address_not_belong_customer>
                 </faults>
             </cart_customer>
             <cart_shipping translate="title" module="checkout">
@@ -187,6 +267,32 @@
                         <acl>cart/shipping/list</acl>
                     </list>
                 </methods>
+                <faults module="checkout">
+                    <store_not_exists>
+                        <code>1001</code>
+                        <message>Can not make operation because store is not exists</message>
+                    </store_not_exists>
+                    <quote_not_exists>
+                        <code>1002</code>
+                        <message>Can not make operation because quote is not exists</message>
+                    </quote_not_exists>
+                    <shipping_address_is_not_set>
+                        <code>1061</code>
+                        <message>Can not make operation because of customer shipping address is not set</message>
+                    </shipping_address_is_not_set>
+                    <shipping_method_is_not_available>
+                        <code>1062</code>
+                        <message>Shipping method is not available</message>
+                    </shipping_method_is_not_available>
+                    <shipping_method_is_not_set>
+                        <code>1063</code>
+                        <message>Can not set shipping method. </message>
+                    </shipping_method_is_not_set>
+                    <shipping_methods_list_could_not_be_retrived>
+                        <code>1064</code>
+                        <message>Can not receive list of shipping methods. </message>
+                    </shipping_methods_list_could_not_be_retrived>
+                </faults>
             </cart_shipping>
             <cart_payment translate="title" module="checkout">
                 <model>checkout/cart_payment_api</model>
@@ -204,6 +310,36 @@
                         <acl>cart/payment/list</acl>
                     </list>
                 </methods>
+                <faults module="checkout">
+                    <store_not_exists>
+                        <code>1001</code>
+                        <message>Can not make operation because store is not exists</message>
+                    </store_not_exists>
+                    <quote_not_exists>
+                        <code>1002</code>
+                        <message>Can not make operation because quote is not exists</message>
+                    </quote_not_exists>
+                    <payment_method_empty>
+                        <code>1071</code>
+                        <message>Payment method data is empty.</message>
+                    </payment_method_empty>
+                    <billing_address_is_not_set>
+                        <code>1072</code>
+                        <message>Customer's billing address is not set. Required for payment method data.</message>
+                    </billing_address_is_not_set>
+                    <shipping_address_is_not_set>
+                        <code>1073</code>
+                        <message>Customer's shipping address is not set. Required for payment method data.</message>
+                    </shipping_address_is_not_set>
+                    <method_not_allowed>
+                        <code>1074</code>
+                        <message>Payment method is not allowed</message>
+                    </method_not_allowed>
+                    <payment_method_is_not_set>
+                        <code>1075</code>
+                        <message>Payment method is not set. </message>
+                    </payment_method_is_not_set>
+                </faults>
             </cart_payment>
             <cart_coupon translate="title" module="checkout">
                 <model>checkout/cart_coupon_api</model>
@@ -221,6 +357,28 @@
                         <acl>cart/coupon/remove</acl>
                     </remove>
                 </methods>
+                <faults module="checkout">
+                    <store_not_exists>
+                        <code>1001</code>
+                        <message>Can not make operation because store is not exists</message>
+                    </store_not_exists>
+                    <quote_not_exists>
+                        <code>1002</code>
+                        <message>Can not make operation because quote is not exists</message>
+                    </quote_not_exists>
+                    <quote_is_empty>
+                        <code>1081</code>
+                        <message>Coupon could not be applied because quote is empty.</message>
+                    </quote_is_empty>
+                    <cannot_apply_coupon_code>
+                        <code>1082</code>
+                        <message>Coupon could not be applied.</message>
+                    </cannot_apply_coupon_code>
+                    <coupon_code_is_not_valid>
+                        <code>1083</code>
+                        <message>Coupon is not valid.</message>
+                    </coupon_code_is_not_valid>
+                </faults>
             </cart_coupon>
         </resources>
         <acl>
diff --git a/app/code/core/Mage/Checkout/etc/wsdl.xml b/app/code/core/Mage/Checkout/etc/wsdl.xml
index 4aab422f5f..0491ffdfbb 100644
--- a/app/code/core/Mage/Checkout/etc/wsdl.xml
+++ b/app/code/core/Mage/Checkout/etc/wsdl.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns:typens="urn:{{var wsdl.name}}" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/"
-    name="{{var wsdl.name}}" targetNamespace="urn:{{var wsdl.name}}">
+<definitions xmlns:typens="urn:{{var wsdl.name}}" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+             xmlns="http://schemas.xmlsoap.org/wsdl/"
+             name="{{var wsdl.name}}" targetNamespace="urn:{{var wsdl.name}}">
     <types>
         <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:Magento">
-            <import namespace="http://schemas.xmlsoap.org/soap/encoding/" schemaLocation="http://schemas.xmlsoap.org/soap/encoding/" />
-<!--            <complexType name="customerCustomerEntityToCreate">
+            <complexType name="shoppingCartAddressEntity">
                 <all>
                     <element name="address_id" type="xsd:string" minOccurs="0"/>
                     <element name="created_at" type="xsd:string" minOccurs="0"/>
@@ -223,8 +224,8 @@
                     <element name="sku" type="xsd:string" minOccurs="0"/>
                     <element name="qty" type="xsd:double" minOccurs="0"/>
                     <element name="options" type="typens:associativeArray" minOccurs="0"/>
-                    <element name="bundle_options" type="typens:associativeArray" minOccurs="0"/>
-                    <element name="bundle_options_qty" type="typens:associativeArray" minOccurs="0"/>
+                    <element name="bundle_option" type="typens:associativeArray" minOccurs="0"/>
+                    <element name="bundle_option_qty" type="typens:associativeArray" minOccurs="0"/>
                     <element name="links" type="typens:ArrayOfString" minOccurs="0"/>
                 </all>
             </complexType>
@@ -255,27 +256,24 @@
                     <element name="store_id" type="xsd:int" minOccurs="0"/>
                     <element name="group_id" type="xsd:int" minOccurs="0"/>
                 </all>
-            </complexType>-->
-<!--            <complexType name="customerCustomerEntity">
+            </complexType>
+            <complexType name="shoppingCartCustomerAddressEntity">
                 <all>
-                    <element name="customer_id" type="xsd:int" minOccurs="0" />
-                    <element name="created_at" type="xsd:string" minOccurs="0" />
-                    <element name="updated_at" type="xsd:string" minOccurs="0" />
-                    <element name="increment_id" type="xsd:string" minOccurs="0" />
-                    <element name="store_id" type="xsd:int" minOccurs="0" />
-                    <element name="website_id" type="xsd:int" minOccurs="0" />
-                    <element name="created_in" type="xsd:string" minOccurs="0" />
-                    <element name="email" type="xsd:string" minOccurs="0" />
-                    <element name="firstname" type="xsd:string" minOccurs="0" />
-                    <element name="middlename" type="xsd:string" minOccurs="0" />
-                    <element name="lastname" type="xsd:string" minOccurs="0" />
-                    <element name="group_id" type="xsd:int" minOccurs="0" />
-                    <element name="prefix" type="xsd:string" minOccurs="0" />
-                    <element name="suffix" type="xsd:string" minOccurs="0" />
-                    <element name="dob" type="xsd:string" minOccurs="0" />
-                    <element name="taxvat" type="xsd:string" minOccurs="0" />
-                    <element name="confirmation" type="xsd:boolean" minOccurs="0" />
-                    <element name="password_hash" type="xsd:string" minOccurs="0" />
+                    <element name="mode" type="xsd:string" minOccurs="0"/>
+                    <element name="address_id" type="xsd:string" minOccurs="0"/>
+                    <element name="firstname" type="xsd:string" minOccurs="0"/>
+                    <element name="lastname" type="xsd:string" minOccurs="0"/>
+                    <element name="company" type="xsd:string" minOccurs="0"/>
+                    <element name="street" type="xsd:string" minOccurs="0"/>
+                    <element name="city" type="xsd:string" minOccurs="0"/>
+                    <element name="region" type="xsd:string" minOccurs="0"/>
+                    <element name="region_id" type="xsd:string" minOccurs="0"/>
+                    <element name="postcode" type="xsd:string" minOccurs="0"/>
+                    <element name="country_id" type="xsd:string" minOccurs="0"/>
+                    <element name="telephone" type="xsd:string" minOccurs="0"/>
+                    <element name="fax" type="xsd:string" minOccurs="0"/>
+                    <element name="is_default_billing" type="xsd:int" minOccurs="0"/>
+                    <element name="is_default_shipping" type="xsd:int" minOccurs="0"/>
                 </all>
             </complexType>
             <complexType name="shoppingCartCustomerAddressEntityArray">
@@ -285,10 +283,15 @@
                     </restriction>
                 </complexContent>
             </complexType>
-            <complexType name="customerGroupEntity">
+            <complexType name="shoppingCartShippingMethodEntity">
                 <all>
-                    <element name="customer_group_id" type="xsd:int" />
-                    <element name="customer_group_code" type="xsd:string" />
+                    <element name="code" type="xsd:string" minOccurs="0"/>
+                    <element name="carrier" type="xsd:string" minOccurs="0"/>
+                    <element name="carrier_title" type="xsd:string" minOccurs="0"/>
+                    <element name="method" type="xsd:string" minOccurs="0"/>
+                    <element name="method_title" type="xsd:string" minOccurs="0"/>
+                    <element name="method_description" type="xsd:string" minOccurs="0"/>
+                    <element name="price" type="xsd:double" minOccurs="0"/>
                 </all>
             </complexType>
             <complexType name="shoppingCartShippingMethodEntityArray">
@@ -298,296 +301,472 @@
                     </restriction>
                 </complexContent>
             </complexType>
-            <complexType name="customerAddressEntityCreate">
+
+            <complexType name="shoppingCartPaymentMethodEntity">
                 <all>
-                    <element name="city" type="xsd:string" minOccurs="0" />
-                    <element name="company" type="xsd:string" minOccurs="0" />
-                    <element name="country_id" type="xsd:string" minOccurs="0" />
-                    <element name="fax" type="xsd:string" minOccurs="0" />
-                    <element name="firstname" type="xsd:string" minOccurs="0" />
-                    <element name="lastname" type="xsd:string" minOccurs="0" />
-                    <element name="middlename" type="xsd:string" minOccurs="0" />
-                    <element name="postcode" type="xsd:string" minOccurs="0" />
-                    <element name="prefix" type="xsd:string" minOccurs="0" />
-                    <element name="region_id" type="xsd:int" minOccurs="0" />
-                    <element name="region" type="xsd:string" minOccurs="0" />
-                    <element name="street" type="typens:ArrayOfString" minOccurs="0" />
-                    <element name="suffix" type="xsd:string" minOccurs="0" />
-                    <element name="telephone" type="xsd:string" minOccurs="0" />
-                    <element name="is_default_billing" type="xsd:boolean" minOccurs="0" />
-                    <element name="is_default_shipping" type="xsd:boolean" minOccurs="0" />
+                    <element name="po_number" type="xsd:string" minOccurs="0"/>
+                    <element name="method" type="xsd:string" minOccurs="0"/>
+                    <element name="cc_cid" type="xsd:string" minOccurs="0"/>
+                    <element name="cc_owner" type="xsd:string" minOccurs="0"/>
+                    <element name="cc_number" type="xsd:string" minOccurs="0"/>
+                    <element name="cc_type" type="xsd:string" minOccurs="0"/>
+                    <element name="cc_exp_year" type="xsd:string" minOccurs="0"/>
+                    <element name="cc_exp_month" type="xsd:string" minOccurs="0"/>
                 </all>
             </complexType>
-            <complexType name="customerAddressEntityItem">
+            <complexType name="shoppingCartPaymentMethodResponseEntityArray">
                 <all>
-                    <element name="customer_address_id" type="xsd:int" minOccurs="0" />
-                    <element name="created_at" type="xsd:string" minOccurs="0" />
-                    <element name="updated_at" type="xsd:string" minOccurs="0" />
-                    <element name="increment_id" type="xsd:string" minOccurs="0" />
-                    <element name="city" type="xsd:string" minOccurs="0" />
-                    <element name="company" type="xsd:string" minOccurs="0" />
-                    <element name="country_id" type="xsd:string" minOccurs="0" />
-                    <element name="fax" type="xsd:string" minOccurs="0" />
-                    <element name="firstname" type="xsd:string" minOccurs="0" />
-                    <element name="lastname" type="xsd:string" minOccurs="0" />
-                    <element name="middlename" type="xsd:string" minOccurs="0" />
-                    <element name="postcode" type="xsd:string" minOccurs="0" />
-                    <element name="prefix" type="xsd:string" minOccurs="0" />
-                    <element name="region" type="xsd:string" minOccurs="0" />
-                    <element name="region_id" type="xsd:int" minOccurs="0" />
-                    <element name="street" type="xsd:string" minOccurs="0" />
-                    <element name="suffix" type="xsd:string" minOccurs="0" />
-                    <element name="telephone" type="xsd:string" minOccurs="0" />
-                    <element name="is_default_billing" type="xsd:boolean" minOccurs="0" />
-                    <element name="is_default_shipping" type="xsd:boolean" minOccurs="0" />
+                    <element name="code" type="xsd:string"/>
+                    <element name="title" type="xsd:string"/>
+                    <element name="cc_types" type="typens:associativeArray"/>
                 </all>
             </complexType>
-            <complexType name="customerAddressEntityArray">
-                <complexContent>
-                    <restriction base="soapenc:Array">
-                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:customerAddressEntityItem[]" />
-                    </restriction>
-                </complexContent>
-            </complexType>-->
         </schema>
     </types>
     <message name="shoppingCartCreateRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="storeId" type="xsd:string" />
+        <part name="sessionId" type="xsd:string"/>
+        <part name="storeId" type="xsd:string"/>
     </message>
     <message name="shoppingCartCreateResponse">
-        <part name="cartId" type="xsd:int" />
+        <part name="quoteId" type="xsd:int"/>
     </message>
-<!--    <message name="customerCustomerCreateRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="customerData" type="typens:customerCustomerEntityToCreate" />
+    <message name="shoppingCartOrderRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="storeId" type="xsd:string"/>
+        <part name="licenses" type="typens:ArrayOfString"/>
     </message>
-    <message name="customerCustomerCreateResponse">
-        <part name="result" type="xsd:int" />
+    <message name="shoppingCartOrderResponse">
+        <part name="result" type="xsd:string"/>
     </message>
-    <message name="customerCustomerInfoRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="customerId" type="xsd:int" />
-        <part name="attributes" type="typens:ArrayOfString" />
+    <message name="shoppingCartInfoRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="storeId" type="xsd:string"/>
     </message>
     <message name="shoppingCartInfoResponse">
         <part name="result" type="typens:shoppingCartInfoEntity"/>
     </message>
-    <message name="customerCustomerUpdateRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="customerId" type="xsd:int" />
-        <part name="customerData" type="typens:customerCustomerEntityToCreate" />
+    <message name="shoppingCartTotalsRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="storeId" type="xsd:string"/>
     </message>
     <message name="shoppingCartTotalsResponse">
         <part name="result" type="typens:shoppingCartTotalsEntityArray"/>
     </message>
-    <message name="customerCustomerDeleteRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="customerId" type="xsd:int" />
+    <message name="shoppingCartLicenseRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="storeId" type="xsd:string"/>
+    </message>
+    <message name="shoppingCartLicenseResponse">
+        <part name="result" type="typens:shoppingCartLicenseEntityArray"/>
+    </message>
+    <message name="shoppingCartProductAddRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="products" type="typens:shoppingCartProductEntityArray"/>
+        <part name="storeId" type="xsd:string"/>
+    </message>
+    <message name="shoppingCartProductAddResponse">
+        <part name="result" type="xsd:boolean"/>
+    </message>
+    <message name="shoppingCartProductUpdateRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="products" type="typens:shoppingCartProductEntityArray"/>
+        <part name="storeId" type="xsd:string"/>
+    </message>
+    <message name="shoppingCartProductUpdateResponse">
+        <part name="result" type="xsd:boolean"/>
+    </message>
+    <message name="shoppingCartProductRemoveRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="products" type="typens:shoppingCartProductEntityArray"/>
+        <part name="storeId" type="xsd:string"/>
+    </message>
+    <message name="shoppingCartProductRemoveResponse">
+        <part name="result" type="xsd:boolean"/>
+    </message>
+    <message name="shoppingCartProductListRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="storeId" type="xsd:string"/>
+    </message>
+    <message name="shoppingCartProductListResponse">
+        <part name="result" type="typens:shoppingCartProductResponseEntityArray"/>
     </message>
-    <message name="customerCustomerDeleteResponse">
-        <part name="result" type="xsd:boolean" />
+    <message name="shoppingCartProductMoveToCustomerQuoteRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="products" type="typens:shoppingCartProductEntityArray"/>
+        <part name="storeId" type="xsd:string"/>
     </message>
-    <message name="customerGroupListRequest">
-        <part name="sessionId" type="xsd:string" />
+    <message name="shoppingCartProductMoveToCustomerQuoteResponse">
+        <part name="result" type="xsd:boolean"/>
     </message>
-    <message name="customerGroupListResponse">
-        <part name="result" type="typens:customerGroupEntityArray" />
+    <message name="shoppingCartCustomerSetRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="customer" type="typens:shoppingCartCustomerEntity"/>
+        <part name="storeId" type="xsd:string"/>
     </message>
-    <message name="customerAddressListRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="customerId" type="xsd:int" />
+    <message name="shoppingCartCustomerSetResponse">
+        <part name="result" type="xsd:boolean"/>
     </message>
-    <message name="customerAddressListResponse">
-        <part name="result" type="typens:customerAddressEntityArray" />
+    <message name="shoppingCartCustomerAddressesRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="customer" type="typens:shoppingCartCustomerAddressEntityArray"/>
+        <part name="storeId" type="xsd:string"/>
     </message>
-    <message name="customerAddressCreateRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="customerId" type="xsd:int" />
-        <part name="addressData" type="typens:customerAddressEntityCreate" />
+    <message name="shoppingCartCustomerAddressesResponse">
+        <part name="result" type="xsd:boolean"/>
     </message>
-    <message name="customerAddressCreateResponse">
-        <part name="result" type="xsd:int" />
+    <message name="shoppingCartShippingMethodRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="method" type="xsd:string"/>
+        <part name="storeId" type="xsd:string"/>
     </message>
-    <message name="customerAddressInfoRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="addressId" type="xsd:int" />
+    <message name="shoppingCartShippingMethodResponse">
+        <part name="result" type="xsd:boolean"/>
     </message>
-    <message name="customerAddressInfoResponse">
-        <part name="info" type="typens:customerAddressEntityItem" />
+    <message name="shoppingCartShippingListRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="storeId" type="xsd:string"/>
     </message>
-    <message name="customerAddressUpdateRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="addressId" type="xsd:int" />
-        <part name="addressData" type="typens:customerAddressEntityCreate" />
+    <message name="shoppingCartShippingListResponse">
+        <part name="result" type="typens:shoppingCartShippingMethodEntityArray"/>
     </message>
-    <message name="customerAddressUpdateResponse">
-        <part name="info" type="xsd:boolean" />
+    <message name="shoppingCartPaymentMethodRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="method" type="typens:shoppingCartPaymentMethodEntity"/>
+        <part name="storeId" type="xsd:string"/>
     </message>
-    <message name="customerAddressDeleteRequest">
-        <part name="sessionId" type="xsd:string" />
-        <part name="addressId" type="xsd:int" />
+    <message name="shoppingCartPaymentMethodResponse">
+        <part name="result" type="xsd:boolean"/>
+    </message>
+    <message name="shoppingCartPaymentListRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="storeId" type="xsd:string"/>
+    </message>
+    <message name="shoppingCartPaymentListResponse">
+        <part name="result" type="typens:shoppingCartPaymentMethodResponseEntityArray"/>
+    </message>
+    <message name="shoppingCartCouponAddRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="couponCode" type="xsd:string"/>
+        <part name="storeId" type="xsd:string"/>
+    </message>
+    <message name="shoppingCartCouponAddResponse">
+        <part name="result" type="xsd:boolean"/>
+    </message>
+    <message name="shoppingCartCouponRemoveRequest">
+        <part name="sessionId" type="xsd:string"/>
+        <part name="quoteId" type="xsd:int"/>
+        <part name="storeId" type="xsd:string"/>
+    </message>
+    <message name="shoppingCartCouponRemoveResponse">
+        <part name="result" type="xsd:boolean"/>
     </message>
-    <message name="customerAddressDeleteResponse">
-        <part name="info" type="xsd:boolean" />
-    </message>-->
     <portType name="{{var wsdl.handler}}PortType">
         <operation name="shoppingCartCreate">
             <documentation>Create shopping cart</documentation>
-            <input message="typens:shoppingCartCreateRequest" />
-            <output message="typens:shoppingCartCreateResponse" />
-        </operation>
-<!--        <operation name="customerCustomerCreate">
-            <documentation>Create customer</documentation>
-            <input message="typens:customerCustomerCreateRequest" />
-            <output message="typens:customerCustomerCreateResponse" />
-        </operation>
-        <operation name="customerCustomerInfo">
-            <documentation>Retrieve customer data</documentation>
-            <input message="typens:customerCustomerInfoRequest" />
-            <output message="typens:customerCustomerInfoResponse" />
-        </operation>
-        <operation name="customerCustomerUpdate">
-            <documentation>Update customer data</documentation>
-            <input message="typens:customerCustomerUpdateRequest" />
-            <output message="typens:customerCustomerUpdateResponse" />
-        </operation>
-        <operation name="customerCustomerDelete">
-            <documentation>Delete customer</documentation>
-            <input message="typens:customerCustomerDeleteRequest" />
-            <output message="typens:customerCustomerDeleteResponse" />
-        </operation>
-        <operation name="customerGroupList">
-            <documentation>Retrieve customer groups</documentation>
-            <input message="typens:customerGroupListRequest" />
-            <output message="typens:customerGroupListResponse" />
-        </operation>
-        <operation name="customerAddressList">
-            <documentation>Retrieve customer addresses</documentation>
-            <input message="typens:customerAddressListRequest" />
-            <output message="typens:customerAddressListResponse" />
-        </operation>
-        <operation name="customerAddressCreate">
-            <documentation>Create customer address</documentation>
-            <input message="typens:customerAddressCreateRequest" />
-            <output message="typens:customerAddressCreateResponse" />
-        </operation>
-        <operation name="customerAddressInfo">
-            <documentation>Retrieve customer address data</documentation>
-            <input message="typens:customerAddressInfoRequest" />
-            <output message="typens:customerAddressInfoResponse" />
-        </operation>
-        <operation name="customerAddressUpdate">
-            <documentation>Update customer address data</documentation>
-            <input message="typens:customerAddressUpdateRequest" />
-            <output message="typens:customerAddressUpdateResponse" />
-        </operation>
-        <operation name="customerAddressDelete">
-            <documentation>Delete customer address</documentation>
-            <input message="typens:customerAddressDeleteRequest" />
-            <output message="typens:customerAddressDeleteResponse" />
-        </operation>-->
+            <input message="typens:shoppingCartCreateRequest"/>
+            <output message="typens:shoppingCartCreateResponse"/>
+        </operation>
+        <operation name="shoppingCartInfo">
+            <documentation>Retrieve information about shopping cart</documentation>
+            <input message="typens:shoppingCartInfoRequest"/>
+            <output message="typens:shoppingCartInfoResponse"/>
+        </operation>
+        <operation name="shoppingCartOrder">
+            <documentation>Create an order from shopping cart</documentation>
+            <input message="typens:shoppingCartOrderRequest"/>
+            <output message="typens:shoppingCartOrderResponse"/>
+        </operation>
+        <operation name="shoppingCartTotals">
+            <documentation>Get total prices for shopping cart</documentation>
+            <input message="typens:shoppingCartTotalsRequest"/>
+            <output message="typens:shoppingCartTotalsResponse"/>
+        </operation>
+        <operation name="shoppingCartLicense">
+            <documentation>Get terms and conditions</documentation>
+            <input message="typens:shoppingCartLicenseRequest"/>
+            <output message="typens:shoppingCartLicenseResponse"/>
+        </operation>
+        <operation name="shoppingCartProductAdd">
+            <documentation>Add product(s) to shopping cart</documentation>
+            <input message="typens:shoppingCartProductAddRequest"/>
+            <output message="typens:shoppingCartProductAddResponse"/>
+        </operation>
+        <operation name="shoppingCartProductUpdate">
+            <documentation>Update product(s) quantities in shopping cart</documentation>
+            <input message="typens:shoppingCartProductUpdateRequest"/>
+            <output message="typens:shoppingCartProductUpdateResponse"/>
+        </operation>
+        <operation name="shoppingCartProductRemove">
+            <documentation>Remove product(s) from shopping cart</documentation>
+            <input message="typens:shoppingCartProductRemoveRequest"/>
+            <output message="typens:shoppingCartProductRemoveResponse"/>
+        </operation>
+        <operation name="shoppingCartProductList">
+            <documentation>Get list of products in shopping cart</documentation>
+            <input message="typens:shoppingCartProductListRequest"/>
+            <output message="typens:shoppingCartProductListResponse"/>
+        </operation>
+        <operation name="shoppingCartProductMoveToCustomerQuote">
+            <documentation>Move product(s) to customer quote</documentation>
+            <input message="typens:shoppingCartProductMoveToCustomerQuoteRequest"/>
+            <output message="typens:shoppingCartProductMoveToCustomerQuoteResponse"/>
+        </operation>
+        <operation name="shoppingCartCustomerSet">
+            <documentation>Set customer for shopping cart</documentation>
+            <input message="typens:shoppingCartCustomerSetRequest"/>
+            <output message="typens:shoppingCartCustomerSetResponse"/>
+        </operation>
+        <operation name="shoppingCartCustomerAddresses">
+            <documentation>Set customer's addresses in shopping cart</documentation>
+            <input message="typens:shoppingCartCustomerAddressesRequest"/>
+            <output message="typens:shoppingCartCustomerAddressesResponse"/>
+        </operation>
+        <operation name="shoppingCartShippingMethod">
+            <documentation>Set shipping method</documentation>
+            <input message="typens:shoppingCartShippingMethodRequest"/>
+            <output message="typens:shoppingCartShippingMethodResponse"/>
+        </operation>
+        <operation name="shoppingCartShippingList">
+            <documentation>Get list of available shipping methods</documentation>
+            <input message="typens:shoppingCartShippingListRequest"/>
+            <output message="typens:shoppingCartShippingListResponse"/>
+        </operation>
+        <operation name="shoppingCartPaymentMethod">
+            <documentation>Set payment method</documentation>
+            <input message="typens:shoppingCartPaymentMethodRequest"/>
+            <output message="typens:shoppingCartPaymentMethodResponse"/>
+        </operation>
+        <operation name="shoppingCartPaymentList">
+            <documentation>Get list of available payment methods</documentation>
+            <input message="typens:shoppingCartPaymentListRequest"/>
+            <output message="typens:shoppingCartPaymentListResponse"/>
+        </operation>
+        <operation name="shoppingCartCouponAdd">
+            <documentation>Add coupon code for shopping cart</documentation>
+            <input message="typens:shoppingCartCouponAddRequest"/>
+            <output message="typens:shoppingCartCouponAddResponse"/>
+        </operation>
+        <operation name="shoppingCartCouponRemove">
+            <documentation>Remove coupon code from shopping cart</documentation>
+            <input message="typens:shoppingCartCouponRemoveRequest"/>
+            <output message="typens:shoppingCartCouponRemoveResponse"/>
+        </operation>
     </portType>
     <binding name="{{var wsdl.handler}}Binding" type="typens:{{var wsdl.handler}}PortType">
-        <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
+        <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
         <operation name="shoppingCartCreate">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
+            <input>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </input>
+            <output>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </output>
+        </operation>
+        <operation name="shoppingCartInfo">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
+            <input>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </input>
+            <output>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </output>
+        </operation>
+        <operation name="shoppingCartTotals">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
+            <input>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </input>
+            <output>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </output>
+        </operation>
+        <operation name="shoppingCartOrder">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
+            <input>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </input>
+            <output>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </output>
+        </operation>
+        <operation name="shoppingCartLicense">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
+            <input>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </input>
+            <output>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </output>
+        </operation>
+        <operation name="shoppingCartProductAdd">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
+            <input>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </input>
+            <output>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </output>
+        </operation>
+        <operation name="shoppingCartProductUpdate">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
-<!--        <operation name="customerCustomerCreate">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+        <operation name="shoppingCartProductRemove">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
-        <operation name="customerCustomerInfo">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+        <operation name="shoppingCartProductList">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
-        <operation name="customerCustomerUpdate">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+        <operation name="shoppingCartProductMoveToCustomerQuote">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
-        <operation name="customerCustomerDelete">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+        <operation name="shoppingCartCustomerSet">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
-        <operation name="customerGroupList">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+        <operation name="shoppingCartCustomerAddresses">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
-        <operation name="customerAddressList">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+        <operation name="shoppingCartShippingMethod">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
-        <operation name="customerAddressCreate">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+        <operation name="shoppingCartShippingList">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
-        <operation name="customerAddressInfo">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+        <operation name="shoppingCartPaymentMethod">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
-        <operation name="customerAddressUpdate">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+        <operation name="shoppingCartPaymentList">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
-        <operation name="customerAddressDelete">
-            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+        <operation name="shoppingCartCouponAdd">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
             <input>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </input>
             <output>
-                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
-        </operation>-->
+        </operation>
+        <operation name="shoppingCartCouponRemove">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action"/>
+            <input>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </input>
+            <output>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </output>
+        </operation>
     </binding>
 </definitions>
diff --git a/app/code/core/Mage/Checkout/etc/wsi.xml b/app/code/core/Mage/Checkout/etc/wsi.xml
new file mode 100644
index 0000000000..066af05eb2
--- /dev/null
+++ b/app/code/core/Mage/Checkout/etc/wsi.xml
@@ -0,0 +1,977 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:typens="urn:{{var wsdl.name}}"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+             name="{{var wsdl.name}}"
+             targetNamespace="urn:{{var wsdl.name}}">
+    <wsdl:types>
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:{{var wsdl.name}}">
+            <xsd:complexType name="shoppingCartAddressEntity">
+                <xsd:sequence>
+                    <xsd:element name="address_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="customer_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="save_in_address_book" type="xsd:int" minOccurs="0"/>
+                    <xsd:element name="customer_address_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="address_type" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="email" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="prefix" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="firstname" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="middlename" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="lastname" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="suffix" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="company" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="street" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="city" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="region" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="region_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="postcode" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="country_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="telephone" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="fax" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="same_as_billing" type="xsd:int" minOccurs="0"/>
+                    <xsd:element name="free_shipping" type="xsd:int" minOccurs="0"/>
+                    <xsd:element name="shipping_method" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="shipping_description" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="weight" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="fax" type="xsd:string" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartItemEntity">
+                <xsd:sequence>
+                    <xsd:element name="item_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="product_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="store_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="parent_item_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="is_virtual" type="xsd:int" minOccurs="0"/>
+                    <xsd:element name="sku" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="name" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="description" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="applied_rule_ids" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="additional_data" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="free_shipping" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="is_qty_decimal" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="no_discount" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="weight" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="qty" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="price" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="base_price" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="custom_price" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="discount_percent" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="discount_amount" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="base_discount_amount" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="tax_percent" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="tax_amount" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="base_tax_amount" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="row_total" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="base_row_total" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="row_total_with_discount" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="row_weight" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="product_type" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="base_tax_before_discount" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="tax_before_discount" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="original_custom_price" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="base_cost" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="price_incl_tax" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="base_price_incl_tax" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="row_total_incl_tax" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="base_row_total_incl_tax" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="gift_message_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="gift_message" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="gift_message_available" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="weee_tax_applied" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="weee_tax_applied_amount" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="weee_tax_applied_row_amount" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="base_weee_tax_applied_amount" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="base_weee_tax_applied_row_amount" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="weee_tax_disposition" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="weee_tax_row_disposition" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="base_weee_tax_disposition" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="base_weee_tax_row_disposition" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="tax_class_id" type="xsd:string" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartItemEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:shoppingCartItemEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartPaymentEntity">
+                <xsd:sequence>
+                    <xsd:element name="payment_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="method" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_type" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_number_enc" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_last4" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_cid_enc" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_owner" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_exp_month" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_exp_year" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_ss_owner" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_ss_start_month" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_ss_start_year" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_ss_issue" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="po_number" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="additional_data" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="additional_information" type="xsd:string" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartInfoEntity">
+                <xsd:sequence>
+                    <xsd:element name="store_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="converted_at" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="quote_id" type="xsd:int" minOccurs="0"/>
+                    <xsd:element name="is_active" type="xsd:int" minOccurs="0"/>
+                    <xsd:element name="is_virtual" type="xsd:int" minOccurs="0"/>
+                    <xsd:element name="is_multi_shipping" type="xsd:int" minOccurs="0"/>
+                    <xsd:element name="items_count" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="items_qty" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="orig_order_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="store_to_base_rate" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="store_to_quote_rate" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="base_currency_code" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="store_currency_code" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="quote_currency_code" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="grand_total" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="base_grand_total" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="checkout_method" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="customer_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="customer_tax_class_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="customer_group_id" type="xsd:int" minOccurs="0"/>
+                    <xsd:element name="customer_email" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="customer_prefix" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="customer_firstname" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="customer_middlename" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="customer_lastname" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="customer_suffix" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="customer_note" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="customer_note_notify" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="customer_is_guest" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="applied_rule_ids" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="reserved_order_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="password_hash" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="coupon_code" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="global_currency_code" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="base_to_global_rate" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="base_to_quote_rate" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="customer_taxvat" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="customer_gender" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="subtotal" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="base_subtotal" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="subtotal_with_discount" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="base_subtotal_with_discount" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="ext_shipping_info" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="gift_message_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="gift_message" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="customer_balance_amount_used" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="base_customer_balance_amount_used" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="use_customer_balance" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="gift_cards_amount" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="base_gift_cards_amount" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="gift_cards_amount_used" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="use_reward_points" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="reward_points_balance" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="base_reward_currency_amount" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="reward_currency_amount" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="shipping_address" type="typens:shoppingCartAddressEntity" minOccurs="0"/>
+                    <xsd:element name="billing_address" type="typens:shoppingCartAddressEntity" minOccurs="0"/>
+                    <xsd:element name="items" type="typens:shoppingCartItemEntityArray" minOccurs="0"/>
+                    <xsd:element name="payment" type="typens:shoppingCartPaymentEntity" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartTotalsEntity">
+                <xsd:sequence>
+                    <xsd:element name="title" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="amount" type="xsd:double" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartTotalsEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:shoppingCartTotalsEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartLicenseEntity">
+                <xsd:sequence>
+                    <xsd:element name="agreement_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="name" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="content" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="is_active" type="xsd:int" minOccurs="0"/>
+                    <xsd:element name="is_html" type="xsd:int" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartLicenseEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:shoppingCartLicenseEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartProductEntity">
+                <xsd:sequence>
+                    <xsd:element name="product_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="sku" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="qty" type="xsd:double" minOccurs="0"/>
+                    <xsd:element name="options" type="typens:associativeArray" minOccurs="0"/>
+                    <xsd:element name="bundle_option" type="typens:associativeArray" minOccurs="0"/>
+                    <xsd:element name="bundle_option_qty" type="typens:associativeArray" minOccurs="0"/>
+                    <xsd:element name="links" type="typens:ArrayOfString" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartProductEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:shoppingCartProductEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartProductResponseEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:catalogProductEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartCustomerEntity">
+                <xsd:sequence>
+                    <xsd:element name="mode" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="customer_id" type="xsd:int" minOccurs="0"/>
+                    <xsd:element name="email" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="firstname" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="lastname" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="password" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="confirmation" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="website_id" type="xsd:int" minOccurs="0"/>
+                    <xsd:element name="store_id" type="xsd:int" minOccurs="0"/>
+                    <xsd:element name="group_id" type="xsd:int" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartCustomerAddressEntity">
+                <xsd:sequence>
+                    <xsd:element name="mode" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="address_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="firstname" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="lastname" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="company" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="street" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="city" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="region" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="region_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="postcode" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="country_id" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="telephone" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="fax" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="is_default_billing" type="xsd:int" minOccurs="0"/>
+                    <xsd:element name="is_default_shipping" type="xsd:int" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartCustomerAddressEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:shoppingCartCustomerAddressEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartShippingMethodEntity">
+                <xsd:sequence>
+                    <xsd:element name="code" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="carrier" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="carrier_title" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="method" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="method_title" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="method_description" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="price" type="xsd:double" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartShippingMethodEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:shoppingCartShippingMethodEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartPaymentMethodEntity">
+                <xsd:sequence>
+                    <xsd:element name="po_number" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="method" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_cid" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_owner" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_number" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_type" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_exp_year" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="cc_exp_month" type="xsd:string" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="shoppingCartPaymentMethodResponseEntityArray">
+                <xsd:sequence>
+                    <xsd:element name="code" type="xsd:string"/>
+                    <xsd:element name="title" type="xsd:string"/>
+                    <xsd:element name="cc_types" type="typens:associativeArray"/>
+                </xsd:sequence>
+            </xsd:complexType>
+
+
+            <xsd:element name="shoppingCartCreateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartCreateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartOrderRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="agreements" type="typens:ArrayOfString" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartOrderResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartInfoRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartInfoResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:shoppingCartInfoEntity" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartTotalsRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartTotalsResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:shoppingCartTotalsEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartLicenseRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartLicenseResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:shoppingCartLicenseEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartProductAddRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productsData" type="typens:shoppingCartProductEntityArray" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartProductAddResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartProductUpdateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productsData" type="typens:shoppingCartProductEntityArray" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartProductUpdateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartProductRemoveRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productsData" type="typens:shoppingCartProductEntityArray" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartProductRemoveResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartProductListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartProductListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:shoppingCartProductResponseEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartProductMoveToCustomerQuoteRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productsData" type="typens:shoppingCartProductEntityArray" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartProductMoveToCustomerQuoteResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartCustomerSetRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="customerData" type="typens:shoppingCartCustomerEntity" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartCustomerSetResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartCustomerAddressesRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="customerAddressData" type="typens:shoppingCartCustomerAddressEntityArray" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartCustomerAddressesResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartShippingMethodRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="shippingMethod" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartShippingMethodResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartShippingListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartShippingListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:shoppingCartShippingMethodEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartPaymentMethodRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="paymentData" type="typens:shoppingCartPaymentMethodEntity" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartPaymentMethodResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartPaymentListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartPaymentListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:shoppingCartPaymentMethodResponseEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartCouponAddRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="couponCode" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartCouponAddResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartCouponRemoveRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:int" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="shoppingCartCouponRemoveResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="shoppingCartCreateRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartCreateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartCreateResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartCreateResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartOrderRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartOrderRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartOrderResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartOrderResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartInfoRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartInfoRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartInfoResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartInfoResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartTotalsRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartTotalsRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartTotalsResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartTotalsResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartLicenseRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartLicenseRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartLicenseResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartLicenseResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartProductAddRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartProductAddRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartProductAddResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartProductAddResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartProductUpdateRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartProductUpdateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartProductUpdateResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartProductUpdateResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartProductRemoveRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartProductRemoveRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartProductRemoveResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartProductRemoveResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartProductListRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartProductListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartProductListResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartProductListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartProductMoveToCustomerQuoteRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartProductMoveToCustomerQuoteRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartProductMoveToCustomerQuoteResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartProductMoveToCustomerQuoteResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartCustomerSetRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartCustomerSetRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartCustomerSetResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartCustomerSetResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartCustomerAddressesRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartCustomerAddressesRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartCustomerAddressesResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartCustomerAddressesResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartShippingMethodRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartShippingMethodRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartShippingMethodResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartShippingMethodResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartShippingListRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartShippingListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartShippingListResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartShippingListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartPaymentMethodRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartPaymentMethodRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartPaymentMethodResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartPaymentMethodResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartPaymentListRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartPaymentListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartPaymentListResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartPaymentListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartCouponAddRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartCouponAddRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartCouponAddResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartCouponAddResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartCouponRemoveRequest">
+        <wsdl:part name="parameters" element="typens:shoppingCartCouponRemoveRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="shoppingCartCouponRemoveResponse">
+        <wsdl:part name="parameters" element="typens:shoppingCartCouponRemoveResponseParam" />
+    </wsdl:message>
+
+    <wsdl:portType name="{{var wsdl.handler}}PortType">
+        <wsdl:operation name="shoppingCartCreate">
+            <wsdl:documentation>Create shopping cart</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartCreateRequest"/>
+            <wsdl:output message="typens:shoppingCartCreateResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartInfo">
+            <wsdl:documentation>Retrieve information about shopping cart</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartInfoRequest"/>
+            <wsdl:output message="typens:shoppingCartInfoResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartOrder">
+            <wsdl:documentation>Create an order from shopping cart</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartOrderRequest"/>
+            <wsdl:output message="typens:shoppingCartOrderResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartTotals">
+            <wsdl:documentation>Get total prices for shopping cart</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartTotalsRequest"/>
+            <wsdl:output message="typens:shoppingCartTotalsResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartLicense">
+            <wsdl:documentation>Get terms and conditions</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartLicenseRequest"/>
+            <wsdl:output message="typens:shoppingCartLicenseResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartProductAdd">
+            <wsdl:documentation>Add product(s) to shopping cart</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartProductAddRequest"/>
+            <wsdl:output message="typens:shoppingCartProductAddResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartProductUpdate">
+            <wsdl:documentation>Update product(s) quantities in shopping cart</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartProductUpdateRequest"/>
+            <wsdl:output message="typens:shoppingCartProductUpdateResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartProductRemove">
+            <wsdl:documentation>Remove product(s) from shopping cart</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartProductRemoveRequest"/>
+            <wsdl:output message="typens:shoppingCartProductRemoveResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartProductList">
+            <wsdl:documentation>Get list of products in shopping cart</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartProductListRequest"/>
+            <wsdl:output message="typens:shoppingCartProductListResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartProductMoveToCustomerQuote">
+            <wsdl:documentation>Move product(s) to customer quote</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartProductMoveToCustomerQuoteRequest"/>
+            <wsdl:output message="typens:shoppingCartProductMoveToCustomerQuoteResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartCustomerSet">
+            <wsdl:documentation>Set customer for shopping cart</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartCustomerSetRequest"/>
+            <wsdl:output message="typens:shoppingCartCustomerSetResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartCustomerAddresses">
+            <wsdl:documentation>Set customer's addresses in shopping cart</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartCustomerAddressesRequest"/>
+            <wsdl:output message="typens:shoppingCartCustomerAddressesResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartShippingMethod">
+            <wsdl:documentation>Set shipping method</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartShippingMethodRequest"/>
+            <wsdl:output message="typens:shoppingCartShippingMethodResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartShippingList">
+            <wsdl:documentation>Get list of available shipping methods</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartShippingListRequest"/>
+            <wsdl:output message="typens:shoppingCartShippingListResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartPaymentMethod">
+            <wsdl:documentation>Set payment method</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartPaymentMethodRequest"/>
+            <wsdl:output message="typens:shoppingCartPaymentMethodResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartPaymentList">
+            <wsdl:documentation>Get list of available payment methods</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartPaymentListRequest"/>
+            <wsdl:output message="typens:shoppingCartPaymentListResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartCouponAdd">
+            <wsdl:documentation>Add coupon code for shopping cart</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartCouponAddRequest"/>
+            <wsdl:output message="typens:shoppingCartCouponAddResponse"/>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartCouponRemove">
+            <wsdl:documentation>Remove coupon code from shopping cart</wsdl:documentation>
+            <wsdl:input message="typens:shoppingCartCouponRemoveRequest"/>
+            <wsdl:output message="typens:shoppingCartCouponRemoveResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="{{var wsdl.handler}}Binding" type="typens:{{var wsdl.handler}}PortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="shoppingCartCreate">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartInfo">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartTotals">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartOrder">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartLicense">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartProductAdd">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartProductUpdate">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartProductRemove">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartProductList">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartProductMoveToCustomerQuote">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartCustomerSet">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartCustomerAddresses">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartShippingMethod">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartShippingList">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartPaymentMethod">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartPaymentList">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartCouponAdd">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="shoppingCartCouponRemove">
+            <soap:operation soapAction=""/>
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+</wsdl:definitions>
diff --git a/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php b/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php
index a11a6df095..ad6459d052 100644
--- a/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php
+++ b/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php
@@ -51,7 +51,7 @@ class Mage_Cms_Helper_Wysiwyg_Images extends Mage_Core_Helper_Abstract
 
 
     /**
-     * Set a specified store ID value 
+     * Set a specified store ID value
      *
      * @param <type> $store
      */
@@ -68,7 +68,8 @@ public function setStoreId($store)
      */
     public function getStorageRoot()
     {
-        return Mage::getConfig()->getOptions()->getMediaDir() . DS;
+        return Mage::getConfig()->getOptions()->getMediaDir() . DS . Mage_Cms_Model_Wysiwyg_Config::IMAGE_DIRECTORY
+            . DS;
     }
 
     /**
diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php
index 2ea30dae90..9bfd2bd3b5 100644
--- a/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php
+++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php
@@ -39,6 +39,7 @@ class Mage_Cms_Model_Wysiwyg_Config extends Varien_Object
     const WYSIWYG_ENABLED = 'enabled';
     const WYSIWYG_HIDDEN = 'hidden';
     const WYSIWYG_DISABLED = 'disabled';
+    const IMAGE_DIRECTORY = 'wysiwyg';
 
     /**
      * Return Wysiwyg config as Varien_Object
@@ -68,19 +69,27 @@ public function getConfig($data = array())
             'add_widgets'                   => true,
             'no_display'                    => false,
             'translator'                    => Mage::helper('cms'),
-            'files_browser_window_url'      => Mage::getSingleton('adminhtml/url')->getUrl('*/cms_wysiwyg_images/index'),
-            'files_browser_window_width'    => (int) Mage::getConfig()->getNode('adminhtml/cms/browser/window_width'),
-            'files_browser_window_height'   => (int) Mage::getConfig()->getNode('adminhtml/cms/browser/window_height'),
             'encode_directives'             => true,
             'directives_url'                => Mage::getSingleton('adminhtml/url')->getUrl('*/cms_wysiwyg/directive'),
-            'popup_css'                     => Mage::getBaseUrl('js').'mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css',
-            'content_css'                   => Mage::getBaseUrl('js').'mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css',
+            'popup_css'                     =>
+                Mage::getBaseUrl('js').'mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css',
+            'content_css'                   =>
+                Mage::getBaseUrl('js').'mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css',
             'width'                         => '100%',
             'plugins'                       => array()
         ));
 
         $config->setData('directives_url_quoted', preg_quote($config->getData('directives_url')));
 
+        if (Mage::getSingleton('admin/session')->isAllowed('cms/media_gallery')) {
+            $config->addData(array(
+                'add_images'               => true,
+                'files_browser_window_url' => Mage::getSingleton('adminhtml/url')->getUrl('*/cms_wysiwyg_images/index'),
+                'files_browser_window_width' => (int) Mage::getConfig()->getNode('adminhtml/cms/browser/window_width'),
+                'files_browser_window_height'=> (int) Mage::getConfig()->getNode('adminhtml/cms/browser/window_height'),
+            ));
+        }
+
         if (is_array($data)) {
             $config->addData($data);
         }
@@ -95,11 +104,11 @@ public function getConfig($data = array())
      *
      * @return string
      */
-    public function getSkinImagePlaceholderUrl() 
+    public function getSkinImagePlaceholderUrl()
     {
         return Mage::getDesign()->getSkinUrl('images/wysiwyg/skin_image.png');
     }
-    
+
     /**
      * Check whether Wysiwyg is enabled or not
      *
diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
index 8e610e0d84..ae46446b6f 100644
--- a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
@@ -198,8 +198,11 @@ public function createDirectory($name, $path)
 
         $io = new Varien_Io_File();
         if ($io->mkdir($newPath)) {
-            $relativePath = Mage::helper('core/file_storage_database')->getMediaRelativePath($newPath);
-            Mage::getModel('core/file_storage_directory_database')->createRecursive($relativePath);
+            if (Mage::helper('core/file_storage_database')->checkDbUsage()) {
+                $relativePath = Mage::helper('core/file_storage_database')->getMediaRelativePath($newPath);
+                Mage::getModel('core/file_storage_directory_database')->createRecursive($relativePath);
+            }
+
             $result = array(
                 'name'          => $name,
                 'short_name'    => $this->getHelper()->getShortFilename($name),
@@ -270,7 +273,7 @@ public function deleteFile($target)
      */
     public function uploadFile($targetPath, $type = null)
     {
-        $uploader = new Varien_File_Uploader('image');
+        $uploader = new Mage_Core_Model_File_Uploader('image');
         if ($allowed = $this->getAllowedExtensions($type)) {
             $uploader->setAllowedExtensions($allowed);
         }
@@ -282,10 +285,6 @@ public function uploadFile($targetPath, $type = null)
             Mage::throwException( Mage::helper('cms')->__('Cannot upload file.') );
         }
 
-        $filePath = rtrim($result['path'], DS) . DS . ltrim($result['file'], DS);
-
-        Mage::helper('core/file_storage_database')->saveFile($filePath);
-
         // create thumbnail
         $this->resizeFile($targetPath . DS . $uploader->getUploadedFileName(), true);
 
diff --git a/app/code/core/Mage/Cms/etc/adminhtml.xml b/app/code/core/Mage/Cms/etc/adminhtml.xml
index 7d0d1f7026..c49e73337a 100644
--- a/app/code/core/Mage/Cms/etc/adminhtml.xml
+++ b/app/code/core/Mage/Cms/etc/adminhtml.xml
@@ -70,6 +70,10 @@
                                     </delete>
                                 </children>
                             </page>
+                            <media_gallery translate="title">
+                                <title>Media Gallery</title>
+                                <sort_order>20</sort_order>
+                            </media_gallery>
                         </children>
                     </cms>
                     <system>
diff --git a/app/code/core/Mage/Cms/etc/config.xml b/app/code/core/Mage/Cms/etc/config.xml
index d93c8400cb..6575e54c2b 100644
--- a/app/code/core/Mage/Cms/etc/config.xml
+++ b/app/code/core/Mage/Cms/etc/config.xml
@@ -97,13 +97,13 @@
             <browser>
                 <dirs>
                     <exclude>
-                        <catalog_dir regexp="0">catalog</catalog_dir><!-- use regexp="0" or "1" to override -->
-                        <downloadable>downloadable</downloadable>
+                        <!-- <catalog_dir regexp="0">catalog</catalog_dir> --><!-- use regexp="0" or "1" to override -->
+                        <!-- downloadable>downloadable</downloadable>
                         <flex_dir>flex</flex_dir>
                         <import>import</import>
                         <tmp>tmp</tmp>
                         <js>js</js>
-                        <css>css</css>
+                        <css>css</css-->
                     </exclude>
                     <include></include>
                 </dirs>
@@ -206,5 +206,12 @@
                 <enabled>enabled</enabled>
             </wysiwyg>
         </cms>
+        <system>
+            <media_storage_configuration>
+                <allowed_resources>
+                    <wysiwyg_image_folder>wysiwyg</wysiwyg_image_folder>
+                </allowed_resources>
+            </media_storage_configuration>
+        </system>
     </default>
 </config>
diff --git a/app/code/core/Mage/Connect/Helper/Data.php b/app/code/core/Mage/Connect/Helper/Data.php
index dc0e8c2bc9..fa9384c601 100644
--- a/app/code/core/Mage/Connect/Helper/Data.php
+++ b/app/code/core/Mage/Connect/Helper/Data.php
@@ -120,6 +120,9 @@ public function convertChannelToV1x($channel)
      */
     public function loadLocalPackage($packageName)
     {
+        //check LFI protection
+        $this->checkLfiProtection($packageName);
+
         $path = $this->getLocalPackagesPath();
         $xmlFile = $path . $packageName . '.xml';
         $serFile = $path . $packageName . '.ser';
diff --git a/app/code/core/Mage/Connect/controllers/Adminhtml/Extension/CustomController.php b/app/code/core/Mage/Connect/controllers/Adminhtml/Extension/CustomController.php
index 31cffc9aac..22f25d34d8 100644
--- a/app/code/core/Mage/Connect/controllers/Adminhtml/Extension/CustomController.php
+++ b/app/code/core/Mage/Connect/controllers/Adminhtml/Extension/CustomController.php
@@ -191,4 +191,14 @@ public function gridAction()
         $this->loadLayout();
         $this->renderLayout();
     }
+
+    /**
+     * Check is allowed access to actions
+     *
+     * @return bool
+     */
+    protected function _isAllowed()
+    {
+        return Mage::getSingleton('admin/session')->isAllowed('system/extensions/custom');
+    }
 }
diff --git a/app/code/core/Mage/Core/Block/Abstract.php b/app/code/core/Mage/Core/Block/Abstract.php
index a4d49166fb..09e66c8901 100644
--- a/app/code/core/Mage/Core/Block/Abstract.php
+++ b/app/code/core/Mage/Core/Block/Abstract.php
@@ -747,7 +747,7 @@ final public function toHtml()
             return '';
         }
         $html = $this->_loadCache();
-        if (!$html) {
+        if ($html === false) {
             $translate = Mage::getSingleton('core/translate');
             /* @var $translate Mage_Core_Model_Translate */
             if ($this->hasData('translate_inline')) {
diff --git a/app/code/core/Mage/Core/Block/Template.php b/app/code/core/Mage/Core/Block/Template.php
index 4287b45e06..4167bfcb79 100644
--- a/app/code/core/Mage/Core/Block/Template.php
+++ b/app/code/core/Mage/Core/Block/Template.php
@@ -34,6 +34,9 @@
  */
 class Mage_Core_Block_Template extends Mage_Core_Block_Abstract
 {
+    const XML_PATH_DEBUG_TEMPLATE_HINTS         = 'dev/debug/template_hints';
+    const XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS  = 'dev/debug/template_hints_blocks';
+    const XML_PATH_TEMPLATE_ALLOW_SYMLINK       = 'dev/template/allow_symlink';
 
     /**
      * View scripts directory
@@ -53,6 +56,13 @@ class Mage_Core_Block_Template extends Mage_Core_Block_Abstract
 
     protected $_jsUrl;
 
+    /**
+     * Is allowed symlinks flag
+     *
+     * @var bool
+     */
+    protected $_allowSymlinks = null;
+
     protected static $_showTemplateHints;
     protected static $_showTemplateHintsBlocks;
 
@@ -176,9 +186,9 @@ public function getDirectOutput()
     public function getShowTemplateHints()
     {
         if (is_null(self::$_showTemplateHints)) {
-            self::$_showTemplateHints = Mage::getStoreConfig('dev/debug/template_hints')
+            self::$_showTemplateHints = Mage::getStoreConfig(self::XML_PATH_DEBUG_TEMPLATE_HINTS)
                 && Mage::helper('core')->isDevAllowed();
-            self::$_showTemplateHintsBlocks = Mage::getStoreConfig('dev/debug/template_hints_blocks')
+            self::$_showTemplateHintsBlocks = Mage::getStoreConfig(self::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS)
                 && Mage::helper('core')->isDevAllowed();
         }
         return self::$_showTemplateHints;
@@ -203,16 +213,25 @@ public function fetchView($fileName)
             ob_start();
         }
         if ($this->getShowTemplateHints()) {
-            echo '<div style="position:relative; border:1px dotted red; margin:6px 2px; padding:18px 2px 2px 2px; zoom:1;"><div style="position:absolute; left:0; top:0; padding:2px 5px; background:red; color:white; font:normal 11px Arial; text-align:left !important; z-index:998;" onmouseover="this.style.zIndex=\'999\'" onmouseout="this.style.zIndex=\'998\'" title="'.$fileName.'">'.$fileName.'</div>';
+            echo <<<HTML
+<div style="position:relative; border:1px dotted red; margin:6px 2px; padding:18px 2px 2px 2px; zoom:1;">
+<div style="position:absolute; left:0; top:0; padding:2px 5px; background:red; color:white; font:normal 11px Arial;
+text-align:left !important; z-index:998;" onmouseover="this.style.zIndex='999'"
+onmouseout="this.style.zIndex='998'" title="{$fileName}">{$fileName}</div>
+HTML;
             if (self::$_showTemplateHintsBlocks) {
                 $thisClass = get_class($this);
-                echo '<div style="position:absolute; right:0; top:0; padding:2px 5px; background:red; color:blue; font:normal 11px Arial; text-align:left !important; z-index:998;" onmouseover="this.style.zIndex=\'999\'" onmouseout="this.style.zIndex=\'998\'" title="'.$thisClass.'">'.$thisClass.'</div>';
+                echo <<<HTML
+<div style="position:absolute; right:0; top:0; padding:2px 5px; background:red; color:blue; font:normal 11px Arial;
+text-align:left !important; z-index:998;" onmouseover="this.style.zIndex='999'" onmouseout="this.style.zIndex='998'"
+title="{$thisClass}">{$thisClass}</div>
+HTML;
             }
         }
 
         try {
             $includeFilePath = realpath($this->_viewDir . DS . $fileName);
-            if (strpos($includeFilePath, realpath($this->_viewDir)) === 0) {
+            if (strpos($includeFilePath, realpath($this->_viewDir)) === 0 || $this->_getAllowSymlinks()) {
                 include $includeFilePath;
             } else {
                 Mage::log('Not valid template file:'.$fileName, Zend_Log::CRIT, null, null, true);
@@ -317,4 +336,17 @@ public function getCacheKeyInfo()
             'template' => $this->getTemplate()
         );
     }
+
+    /**
+     * Get is allowed symliks flag
+     *
+     * @return bool
+     */
+    protected function _getAllowSymlinks()
+    {
+        if (is_null($this->_allowSymlinks)) {
+            $this->_allowSymlinks = Mage::getStoreConfigFlag(self::XML_PATH_TEMPLATE_ALLOW_SYMLINK);
+        }
+        return $this->_allowSymlinks;
+    }
 }
diff --git a/app/code/core/Mage/Core/Controller/Request/Http.php b/app/code/core/Mage/Core/Controller/Request/Http.php
index 0420e08712..2425a13085 100644
--- a/app/code/core/Mage/Core/Controller/Request/Http.php
+++ b/app/code/core/Mage/Core/Controller/Request/Http.php
@@ -35,6 +35,7 @@
 class Mage_Core_Controller_Request_Http extends Zend_Controller_Request_Http
 {
     const XML_NODE_DIRECT_FRONT_NAMES = 'global/request/direct_front_name';
+    const DEFAULT_HTTP_PORT = 80;
 
     /**
      * ORIGINAL_PATH_INFO
diff --git a/app/code/core/Mage/Core/Controller/Varien/Action.php b/app/code/core/Mage/Core/Controller/Varien/Action.php
index a87e828031..8333176c7c 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Action.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Action.php
@@ -282,7 +282,9 @@ public function addActionLayoutHandles()
 
         // load theme handle
         $package = Mage::getSingleton('core/design_package');
-        $update->addHandle('THEME_'.$package->getArea().'_'.$package->getPackageName().'_'.$package->getTheme('layout'));
+        $update->addHandle(
+            'THEME_'.$package->getArea().'_'.$package->getPackageName().'_'.$package->getTheme('layout')
+        );
 
         // load action handle
         $update->addHandle(strtolower($this->getFullActionName()));
@@ -490,7 +492,8 @@ public function preDispatch()
 
         Mage::app()->loadArea($this->getLayout()->getArea());
 
-        if ($this->getFlag('', self::FLAG_NO_COOKIES_REDIRECT) && Mage::getStoreConfig('web/browser_capabilities/cookies')) {
+        if ($this->getFlag('', self::FLAG_NO_COOKIES_REDIRECT)
+            && Mage::getStoreConfig('web/browser_capabilities/cookies')) {
             $this->_forward('noCookies', 'index', 'core');
             return;
         }
@@ -760,7 +763,8 @@ protected function _isUrlInternal($url)
              * Url must start from base secure or base unsecure url
              */
             if ((strpos($url, Mage::app()->getStore()->getBaseUrl()) === 0)
-                || (strpos($url, Mage::app()->getStore()->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK, true)) === 0)) {
+                || (strpos($url, Mage::app()->getStore()->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK, true)) === 0)
+            ) {
                 return true;
             }
         }
@@ -987,7 +991,11 @@ protected function _filterDateTime($array, $dateFields)
      * @param int $contentLength    explicit content length, if strlen($content) isn't applicable
      * @return Mage_Core_Controller_Varien_Action
      */
-    protected function _prepareDownloadResponse($fileName, $content, $contentType = 'application/octet-stream', $contentLength = null)
+    protected function _prepareDownloadResponse(
+        $fileName,
+        $content,
+        $contentType = 'application/octet-stream',
+        $contentLength = null)
     {
         $session = Mage::getSingleton('admin/session');
         if ($session->isFirstPageAfterLogin()) {
diff --git a/app/code/core/Mage/Core/Helper/Data.php b/app/code/core/Mage/Core/Helper/Data.php
index cf949d653b..9469909cb5 100644
--- a/app/code/core/Mage/Core/Helper/Data.php
+++ b/app/code/core/Mage/Core/Helper/Data.php
@@ -31,7 +31,9 @@
  */
 class Mage_Core_Helper_Data extends Mage_Core_Helper_Abstract
 {
-    const XML_PATH_DEFAULT_COUNTRY  = 'general/country/default';
+    const XML_PATH_DEFAULT_COUNTRY              = 'general/country/default';
+    const XML_PATH_PROTECTED_FILE_EXTENSIONS    = 'general/file/protected_extensions';
+    const XML_PATH_PUBLIC_FILES_VALID_PATHS     = 'general/file/public_files_valid_paths';
 
     /**
      * @var Mage_Core_Model_Encryption
@@ -270,16 +272,33 @@ public function removeAccents($string, $german=false)
         if (empty($replacements[$german])) {
             $subst = array(
                 // single ISO-8859-1 letters
-                192=>'A', 193=>'A', 194=>'A', 195=>'A', 196=>'A', 197=>'A', 199=>'C', 208=>'D', 200=>'E', 201=>'E', 202=>'E', 203=>'E', 204=>'I', 205=>'I', 206=>'I', 207=>'I', 209=>'N', 210=>'O', 211=>'O', 212=>'O', 213=>'O', 214=>'O', 216=>'O', 138=>'S', 217=>'U', 218=>'U', 219=>'U', 220=>'U', 221=>'Y', 142=>'Z', 224=>'a', 225=>'a', 226=>'a', 227=>'a', 228=>'a', 229=>'a', 231=>'c', 232=>'e', 233=>'e', 234=>'e', 235=>'e', 236=>'i', 237=>'i', 238=>'i', 239=>'i', 241=>'n', 240=>'o', 242=>'o', 243=>'o', 244=>'o', 245=>'o', 246=>'o', 248=>'o', 154=>'s', 249=>'u', 250=>'u', 251=>'u', 252=>'u', 253=>'y', 255=>'y', 158=>'z',
+                192=>'A', 193=>'A', 194=>'A', 195=>'A', 196=>'A', 197=>'A', 199=>'C',
+                208=>'D', 200=>'E', 201=>'E', 202=>'E', 203=>'E', 204=>'I', 205=>'I',
+                206=>'I', 207=>'I', 209=>'N', 210=>'O', 211=>'O', 212=>'O', 213=>'O',
+                214=>'O', 216=>'O', 138=>'S', 217=>'U', 218=>'U', 219=>'U', 220=>'U',
+                221=>'Y', 142=>'Z', 224=>'a', 225=>'a', 226=>'a', 227=>'a', 228=>'a',
+                229=>'a', 231=>'c', 232=>'e', 233=>'e', 234=>'e', 235=>'e', 236=>'i',
+                237=>'i', 238=>'i', 239=>'i', 241=>'n', 240=>'o', 242=>'o', 243=>'o',
+                244=>'o', 245=>'o', 246=>'o', 248=>'o', 154=>'s', 249=>'u', 250=>'u',
+                251=>'u', 252=>'u', 253=>'y', 255=>'y', 158=>'z',
                 // HTML entities
-                258=>'A', 260=>'A', 262=>'C', 268=>'C', 270=>'D', 272=>'D', 280=>'E', 282=>'E', 286=>'G', 304=>'I', 313=>'L', 317=>'L', 321=>'L', 323=>'N', 327=>'N', 336=>'O', 340=>'R', 344=>'R', 346=>'S', 350=>'S', 354=>'T', 356=>'T', 366=>'U', 368=>'U', 377=>'Z', 379=>'Z', 259=>'a', 261=>'a', 263=>'c', 269=>'c', 271=>'d', 273=>'d', 281=>'e', 283=>'e', 287=>'g', 305=>'i', 322=>'l', 314=>'l', 318=>'l', 324=>'n', 328=>'n', 337=>'o', 341=>'r', 345=>'r', 347=>'s', 351=>'s', 357=>'t', 355=>'t', 367=>'u', 369=>'u', 378=>'z', 380=>'z',
+                258=>'A', 260=>'A', 262=>'C', 268=>'C', 270=>'D', 272=>'D', 280=>'E',
+                282=>'E', 286=>'G', 304=>'I', 313=>'L', 317=>'L', 321=>'L', 323=>'N',
+                327=>'N', 336=>'O', 340=>'R', 344=>'R', 346=>'S', 350=>'S', 354=>'T',
+                356=>'T', 366=>'U', 368=>'U', 377=>'Z', 379=>'Z', 259=>'a', 261=>'a',
+                263=>'c', 269=>'c', 271=>'d', 273=>'d', 281=>'e', 283=>'e', 287=>'g',
+                305=>'i', 322=>'l', 314=>'l', 318=>'l', 324=>'n', 328=>'n', 337=>'o',
+                341=>'r', 345=>'r', 347=>'s', 351=>'s', 357=>'t', 355=>'t', 367=>'u',
+                369=>'u', 378=>'z', 380=>'z',
                 // ligatures
                 198=>'Ae', 230=>'ae', 140=>'Oe', 156=>'oe', 223=>'ss',
             );
 
             if ($german) {
                 // umlauts
-                $subst = array_merge($subst, array(196=>'Ae', 228=>'ae', 214=>'Oe', 246=>'oe', 220=>'Ue', 252=>'ue'));
+                $subst = array_merge($subst, array(
+                    196=>'Ae', 228=>'ae', 214=>'Oe', 246=>'oe', 220=>'Ue', 252=>'ue'
+                ));
             }
 
             $replacements[$german] = array();
@@ -632,9 +651,12 @@ public function uniqHash($prefix = '')
     /**
      * Merge specified files into one
      *
-     * By default will not merge, if there is already merged file exists and it was modified after its components
-     * If target file is specified, will attempt to write merged contents into it, otherwise will return merged content
-     * May apply callback to each file contents. Callback gets parameters: (<existing system filename>, <file contents>)
+     * By default will not merge, if there is already merged file exists and it
+     * was modified after its components
+     * If target file is specified, will attempt to write merged contents into it,
+     * otherwise will return merged content
+     * May apply callback to each file contents. Callback gets parameters:
+     * (<existing system filename>, <file contents>)
      * May filter files by specified extension(s)
      * Returns false on error
      *
@@ -645,7 +667,8 @@ public function uniqHash($prefix = '')
      * @param array|string $extensionsFilter
      * @return bool|string
      */
-    public function mergeFiles(array $srcFiles, $targetFile = false, $mustMerge = false, $beforeMergeCallback = null, $extensionsFilter = array())
+    public function mergeFiles(array $srcFiles, $targetFile = false, $mustMerge = false,
+        $beforeMergeCallback = null, $extensionsFilter = array())
     {
         try {
             // check whether merger is required
@@ -729,4 +752,40 @@ public function getDefaultCountry($store = null)
     {
         return Mage::getStoreConfig(self::XML_PATH_DEFAULT_COUNTRY, $store);
     }
+
+    /**
+     * Return list with protected file extensions
+     *
+     * @param Mage_Core_Model_Store|string|int $store
+     * @return array
+     */
+    public function getProtectedFileExtensions($store = null)
+    {
+        return Mage::getStoreConfig(self::XML_PATH_PROTECTED_FILE_EXTENSIONS, $store);
+    }
+
+    /**
+     * Return list with public files valid paths
+     *
+     * @return array
+     */
+    public function getPublicFilesValidPath()
+    {
+        return Mage::getStoreConfig(self::XML_PATH_PUBLIC_FILES_VALID_PATHS);
+    }
+
+    /**
+     * Check LFI protection
+     *
+     * @throws Mage_Core_Exception
+     * @param string $name
+     * @return bool
+     */
+    public function checkLfiProtection($name)
+    {
+        if (preg_match('#\.\.[\\\/]#', $name)) {
+            throw new Mage_Core_Exception($this->__('Requested file may not include parent directory traversal ("../", "..\\" notation)'));
+        }
+        return true;
+    }
 }
diff --git a/app/code/core/Mage/Core/Helper/File/Storage/Database.php b/app/code/core/Mage/Core/Helper/File/Storage/Database.php
index 546b71658d..49f2c59c7b 100644
--- a/app/code/core/Mage/Core/Helper/File/Storage/Database.php
+++ b/app/code/core/Mage/Core/Helper/File/Storage/Database.php
@@ -52,6 +52,13 @@ class Mage_Core_Helper_File_Storage_Database extends Mage_Core_Helper_Abstract
      */
     protected $_useDb = null;
 
+    /**
+     * Media dir
+     *
+     * @var string
+     */
+    protected $_mediaBaseDirectory;
+
     /**
      * Check if we use DB storage
      * Note: Disabled as not completed feature
@@ -60,10 +67,9 @@ class Mage_Core_Helper_File_Storage_Database extends Mage_Core_Helper_Abstract
      */
     public function checkDbUsage()
     {
-        return false;
-        if (is_null($this->_useDb)) {
-            $currentStorage = (int) Mage::app()
-                ->getConfig()->getNode(Mage_Core_Model_File_Storage::XML_PATH_STORAGE_MEDIA);
+        if (null === $this->_useDb) {
+            $currentStorage = (int) Mage::app()->getConfig()
+                ->getNode(Mage_Core_Model_File_Storage::XML_PATH_STORAGE_MEDIA);
             $this->_useDb = ($currentStorage == Mage_Core_Model_File_Storage::STORAGE_MEDIA_DATABASE);
         }
 
@@ -125,7 +131,8 @@ public function saveFile($filename)
      * @param string $oldName
      * @param string $newName
      */
-    public function renameFile($oldName, $newName) {
+    public function renameFile($oldName, $newName)
+    {
         if ($this->checkDbUsage()) {
             $this->getStorageDatabaseModel()
                 ->renameFile($this->_removeAbsPathFromFileName($oldName), $this->_removeAbsPathFromFileName($newName));
@@ -175,7 +182,7 @@ public function getUniqueFilename($directory, $filename)
                 $index = 1;
                 $extension = strrchr($filename, '.');
                 $filenameWoExtension = substr($filename, 0, -1 * strlen($extension));
-                while($this->fileExists($directory . $filenameWoExtension . '_' . $index . $extension)) {
+                while ($this->fileExists($directory . $filenameWoExtension . '_' . $index . $extension)) {
                     $index ++;
                 }
                 $filename = $filenameWoExtension . '_' . $index . $extension;
@@ -192,7 +199,9 @@ public function getUniqueFilename($directory, $filename)
      */
     public function saveFileToFilesystem($filename) {
         if ($this->checkDbUsage()) {
-            $file = Mage::getModel('core/file_storage_database')->loadByFilename($this->_removeAbsPathFromFileName($filename));
+            /** @var $file Mage_Core_Model_File_Storage_Database */
+            $file = Mage::getModel('core/file_storage_database')
+                ->loadByFilename($this->_removeAbsPathFromFileName($filename));
             if (!$file->getId()) {
                 return false;
             }
@@ -209,7 +218,7 @@ public function saveFileToFilesystem($filename) {
      */
     public function getMediaRelativePath($fullPath)
     {
-        $relativePath = ltrim(str_replace(Mage::getBaseDir('media'), '', $fullPath), DS);
+        $relativePath = ltrim(str_replace($this->getMediaBaseDir(), '', $fullPath), '\\/');
         return str_replace(DS, '/', $relativePath);
     }
 
@@ -238,9 +247,9 @@ public function deleteFile($filename)
     }
 
     /**
-     * Saves uploaded by Varien_File_Uploader file to DB with existence tests
+     * Saves uploaded by Mage_Core_Model_File_Uploader file to DB with existence tests
      *
-     * param $result should be result from Varien_File_Uploader::save() method
+     * param $result should be result from Mage_Core_Model_File_Uploader::save() method
      * Checks in DB, whether uploaded file exists ($result['file'])
      * If yes, renames file on FS (!!!!!)
      * Saves file with unique name into DB
@@ -253,16 +262,15 @@ public function deleteFile($filename)
     public function saveUploadedFile($result = array())
     {
         if ($this->checkDbUsage()) {
-            $path = str_replace('/', DS, $result['path']);
-            if (!in_array(substr($result['file'], 0, 1), array('/', DS))
-                && !in_array(substr($result['path'], -1), array('/', DS))) {
-                $path = $path . '/';
-            }
-            $uniqueResultFile = $this->getUniqueFilename($path, $result['file']);
-            if ($uniqueResultFile !== $result['file']) {
-                $ioObject = new Varien_Io_File();
-                $ioObject->open(array('path' => $path));
-                $ioObject->mv($path . $result['file'], $path . $uniqueResultFile);
+            $path = rtrim(str_replace(array('\\', '/'), DS, $result['path']), DS);
+            $file = '/' . ltrim($result['file'], '\\/');
+
+            $uniqueResultFile = $this->getUniqueFilename($path, $file);
+
+            if ($uniqueResultFile !== $file) {
+                $ioFile = new Varien_Io_File();
+                $ioFile->open(array('path' => $path));
+                $ioFile->mv($path . $file, $path . $uniqueResultFile);
             }
             $this->saveFile($path . $uniqueResultFile);
 
@@ -273,7 +281,7 @@ public function saveUploadedFile($result = array())
     }
 
     /**
-     * Convert full filepath to local (as used by model)
+     * Convert full file path to local (as used by model)
      * If not - returns just a filename
      *
      * @param string $filename
@@ -291,6 +299,9 @@ protected function _removeAbsPathFromFileName($filename)
      */
     public function getMediaBaseDir()
     {
-        return rtrim(Mage::getBaseDir('media'), DS);
+        if (null === $this->_mediaBaseDirectory) {
+            $this->_mediaBaseDirectory = rtrim(Mage::getBaseDir('media'), '\\/');
+        }
+        return $this->_mediaBaseDirectory;
     }
 }
diff --git a/app/code/core/Mage/Core/Helper/Js.php b/app/code/core/Mage/Core/Helper/Js.php
index 97a0828eb5..119f159775 100644
--- a/app/code/core/Mage/Core/Helper/Js.php
+++ b/app/code/core/Mage/Core/Helper/Js.php
@@ -208,7 +208,13 @@ protected function _getTranslateData()
                 'Please enter a valid day (1-%d).' => $this->__('Please enter a valid day (1-%d).'),
                 'Please enter a valid month (1-12).' => $this->__('Please enter a valid month (1-12).'),
                 'Please enter a valid year (1900-%d).' => $this->__('Please enter a valid year (1900-%d).'),
-                'Please enter a valid full date' => $this->__('Please enter a valid full date')
+                'Please enter a valid full date' => $this->__('Please enter a valid full date'),
+                'Please enter a valid date between %s and %s' =>
+                    $this->__('Please enter a valid date between %s and %s'),
+                'Please enter a valid date equal to or greater than %s' =>
+                    $this->__('Please enter a valid date equal to or greater than %s'),
+                'Please enter a valid date less than or equal to %s' =>
+                    $this->__('Please enter a valid date less than or equal to %s')
             );
             foreach ($this->_translateData as $key=>$value) {
                 if ($key == $value) {
diff --git a/app/code/core/Mage/Core/Helper/Url.php b/app/code/core/Mage/Core/Helper/Url.php
index eb502f17b5..c0816a6aea 100644
--- a/app/code/core/Mage/Core/Helper/Url.php
+++ b/app/code/core/Mage/Core/Helper/Url.php
@@ -42,7 +42,15 @@ class Mage_Core_Helper_Url extends Mage_Core_Helper_Abstract
     public function getCurrentUrl()
     {
         $request = Mage::app()->getRequest();
-        $url = $request->getScheme() . '://' . $request->getHttpHost() . $request->getServer('REQUEST_URI');
+        $port = $request->getServer('SERVER_PORT');
+        if ($port) {
+            if ($port == Mage_Core_Controller_Request_Http::DEFAULT_HTTP_PORT) {
+                $port = '';
+            } else {
+                $port = ':' . $port;
+            }
+        }
+        $url = $request->getScheme() . '://' . $request->getHttpHost() . $port . $request->getServer('REQUEST_URI');
         return $url;
 //        return $this->_getUrl('*/*/*', array('_current' => true, '_use_rewrite' => true));
     }
diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php
index c996950ed5..1833dd33c1 100644
--- a/app/code/core/Mage/Core/Model/App.php
+++ b/app/code/core/Mage/Core/Model/App.php
@@ -451,7 +451,8 @@ protected function _initCurrentStore($scopeCode, $scopeType)
             $this->_checkCookieStore($scopeType);
             $this->_checkGetStore($scopeType);
         }
-        $this->_useSessionInUrl = $this->getStore()->getConfig(Mage_Core_Model_Session_Abstract::XML_PATH_USE_FRONTEND_SID);
+        $this->_useSessionInUrl = $this->getStore()->getConfig(
+            Mage_Core_Model_Session_Abstract::XML_PATH_USE_FRONTEND_SID);
         return $this;
     }
 
@@ -566,12 +567,17 @@ protected function _initStores()
         $this->_website  = null;
         $this->_websites = array();
 
+        /** @var $websiteCollection Mage_Core_Model_Website */
         $websiteCollection = Mage::getModel('core/website')->getCollection()
-            ->initCache($this->getCache(), 'app', array(Mage_Core_Model_Website::CACHE_TAG))
-            ->setLoadDefault(true);
+                ->initCache($this->getCache(), 'app', array(Mage_Core_Model_Website::CACHE_TAG))
+                ->setLoadDefault(true);
+
+        /** @var $websiteCollection Mage_Core_Model_Store_Group */
         $groupCollection = Mage::getModel('core/store_group')->getCollection()
-            ->initCache($this->getCache(), 'app', array(Mage_Core_Model_Store_Group::CACHE_TAG))
-            ->setLoadDefault(true);
+                ->initCache($this->getCache(), 'app', array(Mage_Core_Model_Store_Group::CACHE_TAG))
+                ->setLoadDefault(true);
+
+        /** @var $websiteCollection Mage_Core_Model_Store */
         $storeCollection = Mage::getModel('core/store')->getCollection()
             ->initCache($this->getCache(), 'app', array(Mage_Core_Model_Store::CACHE_TAG))
             ->setLoadDefault(true);
@@ -586,7 +592,7 @@ protected function _initStores()
         $groupStores   = array();
 
         foreach ($storeCollection as $store) {
-            /* @var $store Mage_Core_Model_Store */
+            /** @var $store Mage_Core_Model_Store */
             $store->initConfigCache();
             $store->setWebsite($websiteCollection->getItemById($store->getWebsiteId()));
             $store->setGroup($groupCollection->getItemById($store->getGroupId()));
@@ -648,7 +654,7 @@ public function isSingleStoreMode()
     }
 
     /**
-     * Retrive store code or null by store group
+     * Retrieve store code or null by store group
      *
      * @param int $group
      * @return string|null
@@ -665,7 +671,7 @@ protected function _getStoreByGroup($group)
     }
 
     /**
-     * Retrive store code or null by website
+     * Retrieve store code or null by website
      *
      * @param int|string $website
      * @return string|null
@@ -1024,7 +1030,8 @@ public function getHelper($name)
     public function getBaseCurrencyCode()
     {
         //return Mage::getStoreConfig(Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE, 0);
-        return (string) Mage::app()->getConfig()->getNode('default/'.Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE);
+        return (string) Mage::app()->getConfig()
+            ->getNode('default/' . Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE);
     }
 
     /**
diff --git a/app/code/core/Mage/Core/Model/Config/Options.php b/app/code/core/Mage/Core/Model/Config/Options.php
index 03a47b11f5..5687c336bf 100644
--- a/app/code/core/Mage/Core/Model/Config/Options.php
+++ b/app/code/core/Mage/Core/Model/Config/Options.php
@@ -33,6 +33,12 @@
  */
 class Mage_Core_Model_Config_Options extends Varien_Object
 {
+    /**
+     * Var directory
+     *
+     * @var string
+     */
+    const VAR_DIRECTORY = 'var';
     /**
      * Flag cache for existing or already created directories
      *
@@ -138,7 +144,8 @@ public function getSysTmpDir()
     public function getVarDir()
     {
         //$dir = $this->getDataSetDefault('var_dir', $this->getBaseDir().DS.'var');
-        $dir = isset($this->_data['var_dir']) ? $this->_data['var_dir'] : $this->_data['base_dir'].DS.'var';
+        $dir = isset($this->_data['var_dir']) ? $this->_data['var_dir']
+            : $this->_data['base_dir'] . DS . self::VAR_DIRECTORY;
         if (!$this->createDirIfNotExists($dir)) {
             $dir = $this->getSysTmpDir().DS.'magento'.DS.'var';
             if (!$this->createDirIfNotExists($dir)) {
diff --git a/app/code/core/Mage/Core/Model/Design/Package.php b/app/code/core/Mage/Core/Model/Design/Package.php
index 34476259f0..a60d437209 100644
--- a/app/code/core/Mage/Core/Model/Design/Package.php
+++ b/app/code/core/Mage/Core/Model/Design/Package.php
@@ -793,12 +793,16 @@ protected function _cssMergerUrlCallback($match)
     protected function _prepareUrl($uri)
     {
         // check absolute or relative url
-        if (!preg_match('/^[http|https]/i', $uri) && !preg_match('/^\//i', $uri)) {
+        if (!preg_match('/^https?:/i', $uri) && !preg_match('/^\//i', $uri)) {
             $fileDir = '';
             $pathParts = explode(DS, $uri);
             $fileDirParts = explode(DS, $this->_callbackFileDir);
             $store = $this->getStore();
-            $secure = $store->isAdmin() ? $store->isAdminUrlSecure() : $store->isFrontUrlSecure();
+            if ($store->isAdmin()) {
+                $secure = $store->isAdminUrlSecure();
+            } else {
+                $secure = $store->isFrontUrlSecure() && Mage::app()->getRequest()->isSecure();
+            }
 
             if ('skin' == $fileDirParts[0]) {
                 $baseUrl = Mage::getBaseUrl('skin', $secure);
diff --git a/app/code/core/Mage/Core/Model/File/Storage.php b/app/code/core/Mage/Core/Model/File/Storage.php
index 33b4903e58..8d1d9654a5 100644
--- a/app/code/core/Mage/Core/Model/File/Storage.php
+++ b/app/code/core/Mage/Core/Model/File/Storage.php
@@ -45,6 +45,9 @@ class Mage_Core_Model_File_Storage extends Mage_Core_Model_Abstract
      */
     const XML_PATH_STORAGE_MEDIA            = 'default/system/media_storage_configuration/media_storage';
     const XML_PATH_STORAGE_MEDIA_DATABASE   = 'default/system/media_storage_configuration/media_database';
+    const XML_PATH_MEDIA_RESOURCE_WHITELIST = 'default/system/media_storage_configuration/allowed_resources';
+    const XML_PATH_MEDIA_UPDATE_TIME        = 'system/media_storage_configuration/configuration_update_time';
+
 
     /**
      * Prefix of model events names
@@ -60,8 +63,9 @@ class Mage_Core_Model_File_Storage extends Mage_Core_Model_Abstract
      * @param  Mage_Core_Model_Abstract $destinationModel
      * @return bool
      */
-    protected function _synchronizeHasErrors(Mage_Core_Model_Abstract $sourceModel, Mage_Core_Model_Abstract $destinationModel)
-    {
+    protected function _synchronizeHasErrors(Mage_Core_Model_Abstract $sourceModel,
+        Mage_Core_Model_Abstract $destinationModel
+    ) {
         if (!$sourceModel || !$destinationModel) {
             return true;
         }
@@ -205,4 +209,24 @@ public function synchronize($storage)
 
         return $this;
     }
+
+    /**
+     * Return current media directory, allowed resources for get.php script, etc.
+     *
+     * @return array
+     */
+    public static function getScriptConfig()
+    {
+        $config = array();
+        $config['media_directory'] = Mage::getBaseDir('media');
+
+        $allowedResources = (array) Mage::app()->getConfig()->getNode(self::XML_PATH_MEDIA_RESOURCE_WHITELIST);
+        foreach ($allowedResources as $key => $allowedResource) {
+            $config['allowed_resources'][] = $allowedResource;
+        }
+
+        $config['update_time'] = Mage::getStoreConfig(self::XML_PATH_MEDIA_UPDATE_TIME);
+
+        return $config;
+    }
 }
diff --git a/app/code/core/Mage/Core/Model/File/Storage/Abstract.php b/app/code/core/Mage/Core/Model/File/Storage/Abstract.php
index 1f11992f46..54fdd5182c 100644
--- a/app/code/core/Mage/Core/Model/File/Storage/Abstract.php
+++ b/app/code/core/Mage/Core/Model/File/Storage/Abstract.php
@@ -48,8 +48,10 @@ abstract class Mage_Core_Model_File_Storage_Abstract extends Mage_Core_Model_Abs
      */
     public function getMediaBaseDirectory()
     {
-        if (is_null($this->_mediaBaseDirectory)) {
-            $this->_mediaBaseDirectory = Mage::helper('core/file_storage_database')->getMediaBaseDir();
+        if (null === $this->_mediaBaseDirectory) {
+            /** @var $helper Mage_Core_Helper_File_Storage_Database */
+            $helper = Mage::helper('core/file_storage_database');
+            $this->_mediaBaseDirectory = $helper->getMediaBaseDir();
         }
 
         return $this->_mediaBaseDirectory;
@@ -57,6 +59,7 @@ public function getMediaBaseDirectory()
 
     /**
      * Collect file info
+     *
      * Return array(
      *  filename    => string
      *  content     => string|bool
@@ -69,7 +72,7 @@ public function getMediaBaseDirectory()
      */
     public function collectFileInfo($path)
     {
-        $path = ltrim($path, DS);
+        $path = ltrim($path, '\\/');
         $fullPath = $this->getMediaBaseDirectory() . DS . $path;
 
         if (!file_exists($fullPath) || !is_file($fullPath)) {
@@ -79,7 +82,7 @@ public function collectFileInfo($path)
             Mage::throwException(Mage::helper('core')->__('File %s is not readable', $fullPath));
         }
 
-        $path = str_replace(DS, '/', $path);
+        $path = str_replace(array('/', '\\'), '/', $path);
         $directory = dirname($path);
         if ($directory == '.') {
             $directory = null;
diff --git a/app/code/core/Mage/Core/Model/File/Uploader.php b/app/code/core/Mage/Core/Model/File/Uploader.php
index e335b254ca..f92b3d4752 100644
--- a/app/code/core/Mage/Core/Model/File/Uploader.php
+++ b/app/code/core/Mage/Core/Model/File/Uploader.php
@@ -42,21 +42,39 @@ class Mage_Core_Model_File_Uploader extends Varien_File_Uploader
      */
     protected function _afterSave($result)
     {
-        if (!isset($result['path']) || empty($result['path'])
-            || !isset($result['file']) || empty($result['file'])
-        ) {
+        if (empty($result['path']) || empty($result['file'])) {
             return $this;
         }
 
+        /** @var $helper Mage_Core_Helper_File_Storage */
         $helper = Mage::helper('core/file_storage');
 
         if ($helper->isInternalStorage()) {
             return $this;
         }
 
+        /** @var $dbHelper Mage_Core_Helper_File_Storage_Database */
         $dbHelper = Mage::helper('core/file_storage_database');
-        $dbHelper->saveFile($result['path'] . $result['file']);
+        $this->_result['file'] = $dbHelper->saveUploadedFile($result);
 
         return $this;
     }
+
+    /**
+     * Check protected/allowed extension
+     *
+     * @param string $extension
+     * @return boolean
+     */
+    public function checkAllowedExtension($extension)
+    {
+        //validate with protected file types
+        /** @var $validator Mage_Core_Model_File_Validator_NotProtectedExtension */
+        $validator = Mage::getSingleton('core/file_validator_notProtectedExtension');
+        if (!$validator->isValid($extension)) {
+            return false;
+        }
+
+        return parent::checkAllowedExtension($extension);
+    }
 }
diff --git a/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php b/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php
new file mode 100644
index 0000000000..a21b739b15
--- /dev/null
+++ b/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php
@@ -0,0 +1,324 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Core
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+
+/**
+ * Validator for check not protected/available path
+ *
+ * Mask symbols from path:
+ * "?" - something directory with any name
+ * "*" - something directory structure, which can not exist
+ * Note: For set directory structure which must be exist, need to set mask "/?/{@*}"
+ * Mask symbols from filename:
+ * "*" - something symbols in file name
+ * Example:
+ * <code>
+ * //set available path
+ * $validator->setAvailablePath(array('/path/to/?/*fileMask.xml'));
+ * $validator->isValid('/path/to/MyDir/Some-fileMask.xml'); //return true
+ * $validator->setAvailablePath(array('/path/to/{@*}*.xml'));
+ * $validator->isValid('/path/to/my.xml'); //return true, because directory structure can't exist
+ * </code>
+ *
+ * @category   Mage
+ * @package    Mage_Core
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Core_Model_File_Validator_AvailablePath extends Zend_Validate_Abstract
+{
+    const PROTECTED_PATH     = 'protectedPath';
+    const NOT_AVAILABLE_PATH = 'notAvailablePath';
+    const PROTECTED_LFI      = 'protectedLfi';
+
+    /**
+     * The path
+     *
+     * @var string
+     */
+    protected $_value;
+
+    /**
+     * Protected paths
+     *
+     * @var array
+     */
+    protected $_protectedPaths = array();
+
+    /**
+     * Available paths
+     *
+     * @var array
+     */
+    protected $_availablePaths = array();
+
+    /**
+     * Cache of made regular expressions from path masks
+     *
+     * @var array
+     */
+    protected $_pathsData;
+
+    /**
+     * Construct
+     */
+    public function __construct()
+    {
+        $this->_initMessageTemplates();
+    }
+
+    /**
+     * Initialize message templates with translating
+     *
+     * @return Mage_Adminhtml_Model_Core_File_Validator_SavePath_Available
+     */
+    protected function _initMessageTemplates()
+    {
+        if (!$this->_messageTemplates) {
+            $this->_messageTemplates = array(
+                self::PROTECTED_PATH =>
+                    Mage::helper('core')->__('Path "%value%" is protected and cannot be used.'),
+                self::NOT_AVAILABLE_PATH =>
+                    Mage::helper('core')->__('Path "%value%" is not available and cannot be used.'),
+                self::PROTECTED_LFI =>
+                    Mage::helper('core')->__('Path "%value%" may not include parent directory traversal ("../", "..\\").'),
+            );
+        }
+        return $this;
+    }
+
+    /**
+     * Set paths masks
+     *
+     * @param array $paths  All paths masks types.
+     *                      E.g.: array('available' => array(...), 'protected' => array(...))
+     * @return Mage_Adminhtml_Model_Core_File_Validator_SavePath_Available
+     */
+    public function setPaths(array $paths)
+    {
+        if (isset($paths['available']) && is_array($paths['available'])) {
+            $this->_availablePaths = $paths['available'];
+        }
+        if (isset($paths['protected']) && is_array($paths['protected'])) {
+            $this->_protectedPaths = $paths['protected'];
+        }
+        return $this;
+    }
+
+    /**
+     * Set protected paths masks
+     *
+     * @param array $paths
+     * @return Mage_Adminhtml_Model_Core_File_Validator_SavePath_Available
+     */
+    public function setProtectedPaths(array $paths)
+    {
+        $this->_protectedPaths = $paths;
+        return $this;
+    }
+
+    /**
+     * Add protected paths masks
+     *
+     * @param string|array $path
+     * @return Mage_Adminhtml_Model_Core_File_Validator_SavePath_Available
+     */
+    public function addProtectedPath($path)
+    {
+        if (is_array($path)) {
+            $this->_protectedPaths = array_merge($this->_protectedPaths, $path);
+        } else {
+            $this->_protectedPaths[] = $path;
+        }
+        return $this;
+    }
+
+    /**
+     * Get protected paths masks
+     *
+     * @return array
+     */
+    public function getProtectedPaths()
+    {
+        return $this->_protectedPaths;
+    }
+
+    /**
+     * Set available paths masks
+     *
+     * @param array $paths
+     * @return Mage_Adminhtml_Model_Core_File_Validator_SavePath_Available
+     */
+    public function setAvailablePaths(array $paths)
+    {
+        $this->_availablePaths = $paths;
+        return $this;
+    }
+
+    /**
+     * Add available paths mask
+     *
+     * @param string|array $path
+     * @return Mage_Adminhtml_Model_Core_File_Validator_SavePath_Available
+     */
+    public function addAvailablePath($path)
+    {
+        if (is_array($path)) {
+            $this->_availablePaths = array_merge($this->_availablePaths, $path);
+        } else {
+            $this->_availablePaths[] = $path;
+        }
+        return $this;
+    }
+
+    /**
+     * Get available paths masks
+     *
+     * @return array
+     */
+    public function getAvailablePaths()
+    {
+        return $this->_availablePaths;
+    }
+
+
+    /**
+     * Returns true if and only if $value meets the validation requirements
+     *
+     * If $value fails validation, then this method returns false, and
+     * getMessages() will return an array of messages that explain why the
+     * validation failed.
+     *
+     * @throws Exception        Throw exception on empty both paths masks types
+     * @param string $value     File/dir path
+     * @return bool
+     */
+    public function isValid($value)
+    {
+        $value = trim($value);
+        $this->_setValue($value);
+
+        if (!$this->_availablePaths && !$this->_protectedPaths) {
+            throw new Exception(Mage::helper('core')->__('Please set available and/or protected paths list(s) before validation.'));
+        }
+
+        if (preg_match('#\.\.[\\\/]#', $this->_value)) {
+            $this->_error(self::PROTECTED_LFI, $this->_value);
+            return false;
+        }
+
+        //validation
+        $value = str_replace(array('/', '\\'), DS, $this->_value);
+        $valuePathInfo = pathinfo(ltrim($value, '\\/'));
+        if ($valuePathInfo['dirname'] == '.' || $valuePathInfo['dirname'] == DS) {
+            $valuePathInfo['dirname'] = '';
+        }
+
+        if ($this->_protectedPaths && !$this->_isValidByPaths($valuePathInfo, $this->_protectedPaths, true)) {
+            $this->_error(self::PROTECTED_PATH, $this->_value);
+            return false;
+        }
+        if ($this->_availablePaths && !$this->_isValidByPaths($valuePathInfo, $this->_availablePaths, false)) {
+            $this->_error(self::NOT_AVAILABLE_PATH, $this->_value);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Validate value by path masks
+     *
+     * @param array $valuePathInfo  Path info from value path
+     * @param array $paths          Protected/available paths masks
+     * @param bool $protected       Paths masks is protected?
+     * @return bool
+     */
+    protected function _isValidByPaths($valuePathInfo, $paths, $protected)
+    {
+        foreach ($paths as $path) {
+            $path = ltrim($path, '\\/');
+            if (!isset($this->_pathsData[$path]['regFilename'])) {
+                $pathInfo = pathinfo($path);
+                $options['file_mask'] = $pathInfo['basename'];
+                if ($pathInfo['dirname'] == '.' || $pathInfo['dirname'] == DS) {
+                    $pathInfo['dirname'] = '';
+                } else {
+                    $pathInfo['dirname'] = str_replace(array('/', '\\'), DS, $pathInfo['dirname']);
+                }
+                $options['dir_mask'] = $pathInfo['dirname'];
+                $this->_pathsData[$path]['options'] = $options;
+            } else {
+                $options = $this->_pathsData[$path]['options'];
+            }
+
+            //file mask
+            if (false !== (strpos($options['file_mask'], '*'))) {
+                if (!isset($this->_pathsData[$path]['regFilename'])) {
+                    //make regular
+                    $reg = $options['file_mask'];
+                    $reg = str_replace('.', '\.', $reg);
+                    $reg = str_replace('*', '.*?', $reg);
+                    $reg = "/^($reg)$/";
+                } else {
+                    $reg = $this->_pathsData[$path]['regFilename'];
+                }
+                $resultFile = preg_match($reg, $valuePathInfo['basename']);
+            } else {
+                $resultFile = ($options['file_mask'] == $valuePathInfo['basename']);
+            }
+
+            //directory mask
+            $reg = $options['dir_mask'] . DS;
+            if (!isset($this->_pathsData[$path]['regDir'])) {
+                //make regular
+                $reg = str_replace('.', '\.', $reg);
+                $reg = str_replace('*\\', '||', $reg);
+                $reg = str_replace('*/', '||', $reg);
+                //$reg = str_replace('*', '||', $reg);
+                $reg = str_replace(DS, '[\\' . DS . ']', $reg);
+                $reg = str_replace('?', '([^\\' . DS . ']+)', $reg);
+                $reg = str_replace('||', '(.*[\\' . DS . '])?', $reg);
+                $reg = "/^$reg$/";
+            } else {
+                $reg = $this->_pathsData[$path]['regDir'];
+            }
+            $resultDir = preg_match($reg, $valuePathInfo['dirname'] . DS);
+
+            if ($protected && ($resultDir && $resultFile)) {
+                return false;
+            } elseif (!$protected && ($resultDir && $resultFile)) {
+                //return true because one match with available path mask
+                return true;
+            }
+        }
+        if ($protected) {
+            return true;
+        } else {
+            //return false because no one match with available path mask
+            return false;
+        }
+    }
+}
diff --git a/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php b/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php
new file mode 100644
index 0000000000..9de0a149c7
--- /dev/null
+++ b/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Core
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+
+/**
+ * Validator for check not protected file extensions
+ *
+ * @category   Mage
+ * @package    Mage_Core
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Core_Model_File_Validator_NotProtectedExtension extends Zend_Validate_Abstract
+{
+    const PROTECTED_EXTENSION = 'protectedExtension';
+
+    /**
+     * The file extension
+     *
+     * @var string
+     */
+    protected $_value;
+
+    /**
+     * Protected file types
+     *
+     * @var array
+     */
+    protected $_protectedFileExtensions = array();
+
+    /**
+     * Construct
+     */
+    public function __construct()
+    {
+        $this->_initMessageTemplates();
+        $this->_initProtectedFileExtensions();
+    }
+
+    /**
+     * Initialize message templates with translating
+     *
+     * @return Mage_Core_Model_File_Validator_NotProtectedExtension
+     */
+    protected function _initMessageTemplates()
+    {
+        if (!$this->_messageTemplates) {
+            /** @var $helper Mage_Core_Helper_Data */
+            $helper = Mage::helper('core');
+            $this->_messageTemplates = array(
+                self::PROTECTED_EXTENSION =>
+                    $helper->__('File with an extension "%value%" is protected and cannot be uploaded'),
+            );
+        }
+        return $this;
+    }
+
+    /**
+     * Initialize protected file extensions
+     *
+     * @return Mage_Core_Model_File_Validator_NotProtectedExtension
+     */
+    protected function _initProtectedFileExtensions()
+    {
+        if (!$this->_protectedFileExtensions) {
+            /** @var $helper Mage_Core_Helper_Data */
+            $helper = Mage::helper('core');
+            $extensions = $helper->getProtectedFileExtensions();
+            if (is_string($extensions)) {
+                $extensions = explode(',', $extensions);
+            }
+            foreach ($extensions as &$ext) {
+                $ext = strtolower(trim($ext));
+            }
+            $this->_protectedFileExtensions = (array) $extensions;
+        }
+        return $this;
+    }
+
+
+    /**
+     * Returns true if and only if $value meets the validation requirements
+     *
+     * If $value fails validation, then this method returns false, and
+     * getMessages() will return an array of messages that explain why the
+     * validation failed.
+     *
+     * @param string $value         Extension of file
+     * @return bool
+     */
+    public function isValid($value)
+    {
+        $value = strtolower(trim($value));
+        $this->_setValue($value);
+
+        if (in_array($this->_value, $this->_protectedFileExtensions)) {
+            $this->_error(self::PROTECTED_EXTENSION, $this->_value);
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php b/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php
new file mode 100644
index 0000000000..0eec59d9d9
--- /dev/null
+++ b/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Core
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Filter for removing malicious code from HTML
+ *
+ * @category   Mage
+ * @package    Mage_Core
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Core_Model_Input_Filter_MaliciousCode implements Zend_Filter_Interface
+{
+    /**
+     * Regular expressions for cutting malicious code
+     *
+     * @var array
+     */
+    protected $_expressions = array(
+        //comments, must be first
+        '/(\/\*.*\*\/)/Us',
+        //tabs
+        '/(\t)/',
+        //javasript prefix
+        '/(javascript\s*:)/Usi',
+        //import styles
+        '/(@import)/Usi',
+        //js in the style attribute
+        '/style=[^<]*((expression\s*?\([^<]*?\))|(behavior\s*:))[^<]*(?=\>)/Uis',
+        //js attributes
+        '/(ondblclick|onclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onload|onunload|onerror)=[^<]*(?=\>)/Uis',
+        //tags
+        '/<\/?(script|meta|link|frame|iframe).*>/Uis',
+        //base64 usage
+        '/src=[^<]*base64[^<]*(?=\>)/Uis',
+    );
+
+    /**
+     * Filter value
+     *
+     * @param string|array $value
+     * @return string|array         Filtered value
+     */
+    public function filter($value)
+    {
+        return preg_replace($this->_expressions, '', $value);
+    }
+
+    /**
+     * Add expression
+     *
+     * @param string $expression
+     * @return Mage_Core_Model_Input_Filter_MaliciousCode
+     */
+    public function addExpression($expression)
+    {
+        if (!in_array($expression, $this->_expressions)) {
+            $this->_expressions[] = $expression;
+        }
+        return $this;
+    }
+
+    /**
+     * Set expressions
+     *
+     * @param array $expressions
+     * @return Mage_Core_Model_Input_Filter_MaliciousCode
+     */
+    public function setExpressions(array $expressions)
+    {
+        $this->_expressions = $expressions;
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php
index 809260c35f..fd190bf4a2 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php
@@ -72,7 +72,7 @@ public function getStorageData($dir = '')
             $dh = opendir($currentDir);
             if ($dh) {
                 while (($file = readdir($dh)) !== false) {
-                    if ($file == '.' || $file == '..') {
+                    if ($file == '.' || $file == '..' || $file == '.svn' || $file == '.htaccess') {
                         continue;
                     }
 
diff --git a/app/code/core/Mage/Core/Model/Session/Abstract.php b/app/code/core/Mage/Core/Model/Session/Abstract.php
index 6693a7e865..f7f09c068c 100644
--- a/app/code/core/Mage/Core/Model/Session/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Session/Abstract.php
@@ -500,4 +500,18 @@ public function getSessionSavePath()
         }
         return parent::getSessionSavePath();
     }
+
+    /**
+     * Renew session id and update session cookie
+     *
+     * @return Mage_Core_Model_Session_Abstract
+     */
+    public function renewSession()
+    {
+        $this->getCookie()->delete($this->getSessionName());
+        $this->regenerateSessionId();
+
+        return $this;
+    }
+
 }
diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
index 9fa671bd6a..18220d9107 100644
--- a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
+++ b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
@@ -355,13 +355,19 @@ protected function _validate()
         $sessionData = $this->_data[self::VALIDATOR_KEY];
         $validatorData = $this->getValidatorData();
 
-        if ($this->useValidateRemoteAddr() && $sessionData[self::VALIDATOR_REMOTE_ADDR_KEY] != $validatorData[self::VALIDATOR_REMOTE_ADDR_KEY]) {
+        if ($this->useValidateRemoteAddr()
+                && $sessionData[self::VALIDATOR_REMOTE_ADDR_KEY] != $validatorData[self::VALIDATOR_REMOTE_ADDR_KEY]) {
             return false;
         }
-        if ($this->useValidateHttpVia() && $sessionData[self::VALIDATOR_HTTP_VIA_KEY] != $validatorData[self::VALIDATOR_HTTP_VIA_KEY]) {
+        if ($this->useValidateHttpVia()
+                && $sessionData[self::VALIDATOR_HTTP_VIA_KEY] != $validatorData[self::VALIDATOR_HTTP_VIA_KEY]) {
             return false;
         }
-        if ($this->useValidateHttpXForwardedFor() && $sessionData[self::VALIDATOR_HTTP_X_FORVARDED_FOR_KEY] != $validatorData[self::VALIDATOR_HTTP_X_FORVARDED_FOR_KEY]) {
+
+        $sessionValidateHttpXForwardedForKey = $sessionData[self::VALIDATOR_HTTP_X_FORVARDED_FOR_KEY];
+        $validatorValidateHttpXForwardedForKey = $validatorData[self::VALIDATOR_HTTP_X_FORVARDED_FOR_KEY];
+        if ($this->useValidateHttpXForwardedFor()
+            && $sessionValidateHttpXForwardedForKey != $validatorValidateHttpXForwardedForKey ) {
             return false;
         }
         if ($this->useValidateHttpUserAgent()
@@ -405,4 +411,15 @@ public function getValidatorData()
 
         return $parts;
     }
+
+    /**
+     * Regenerate session Id
+     *
+     * @return Mage_Core_Model_Session_Abstract_Varien
+     */
+    public function regenerateSessionId()
+    {
+        session_regenerate_id(true);
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php
index 5ff15725b1..80adc728c5 100644
--- a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php
+++ b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php
@@ -162,4 +162,15 @@ public function setSessionId($id=null)
         }
         return $this;
     }
+
+    /**
+     * Regenerate session Id
+     *
+     * @return Mage_Core_Model_Session_Abstract_Zend
+     */
+    public function regenerateSessionId()
+    {
+        Zend_Session::regenerateId();
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php
index c1ee523e07..cbf61086b0 100644
--- a/app/code/core/Mage/Core/Model/Store.php
+++ b/app/code/core/Mage/Core/Model/Store.php
@@ -347,7 +347,7 @@ protected function _processConfigValue($fullPath, $path, $node)
             } elseif (strpos($sValue, '{{secure_base_url}}')!==false) {
                 $secureBaseUrl = $this->getConfig('web/secure/base_url');
                 $sValue = str_replace('{{secure_base_url}}', $secureBaseUrl, $sValue);
-            } else {
+            } elseif (strpos($sValue, '{{base_url}}') === false) {
                 $sValue = Mage::getConfig()->substDistroServerVars($sValue);
             }
         }
@@ -370,14 +370,14 @@ public function processSubst($value)
             return $value;
         }
 
-        if (strpos($value, '{{unsecure_base_url}}')!==false) {
+        if (strpos($value, '{{unsecure_base_url}}') !== false) {
             $unsecureBaseUrl = $this->getConfig('web/unsecure/base_url');
             $value = str_replace('{{unsecure_base_url}}', $unsecureBaseUrl, $value);
 
-        } elseif (strpos($value, '{{secure_base_url}}')!==false) {
+        } elseif (strpos($value, '{{secure_base_url}}') !== false) {
             $secureBaseUrl = $this->getConfig('web/secure/base_url');
             $value = str_replace('{{secure_base_url}}', $secureBaseUrl, $value);
-        } elseif (strpos($value, '{{')!==false) {
+        } elseif (strpos($value, '{{') !== false && strpos($value, '{{base_url}}') === false) {
             $value = Mage::getConfig()->substDistroServerVars($value);
         }
         return $value;
@@ -410,7 +410,7 @@ public function getUrl($route = '', $params = array())
         return $url->getUrl($route, $params);
     }
 
-    public function getBaseUrl($type=self::URL_TYPE_LINK, $secure=null)
+    public function getBaseUrl($type = self::URL_TYPE_LINK, $secure = null)
     {
         $cacheKey = $type.'/'.(is_null($secure) ? 'null' : ($secure ? 'true' : 'false'));
         if (!isset($this->_baseUrlCache[$cacheKey])) {
@@ -447,7 +447,12 @@ public function getBaseUrl($type=self::URL_TYPE_LINK, $secure=null)
                     throw Mage::exception('Mage_Core', Mage::helper('core')->__('Invalid base url type'));
             }
 
-            $this->_baseUrlCache[$cacheKey] = rtrim($url, '/').'/';
+            if (false !== strpos($url, '{{base_url}}')) {
+                $baseUrl = Mage::getConfig()->substDistroServerVars('{{base_url}}');
+                $url = str_replace('{{base_url}}', $baseUrl, $url);
+            }
+
+            $this->_baseUrlCache[$cacheKey] = rtrim($url, '/') . '/';
         }
 
         return $this->_baseUrlCache[$cacheKey];
@@ -592,7 +597,8 @@ public function isCurrentlySecure()
      */
     public function getBaseCurrencyCode()
     {
-        if ($this->getConfig(Mage_Core_Model_Store::XML_PATH_PRICE_SCOPE) == Mage_Core_Model_Store::PRICE_SCOPE_GLOBAL) {
+        $configValue = $this->getConfig(Mage_Core_Model_Store::XML_PATH_PRICE_SCOPE);
+        if ($configValue == Mage_Core_Model_Store::PRICE_SCOPE_GLOBAL) {
             return Mage::app()->getBaseCurrencyCode();
         } else {
             return $this->getConfig(Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE);
@@ -893,7 +899,8 @@ public function isCanDelete()
     public function getCurrentUrl($fromStore = true)
     {
         $sidQueryParam = $this->_getSession()->getSessionIdQueryParam();
-        $requestString = Mage::getSingleton('core/url')->escape(ltrim(Mage::app()->getRequest()->getRequestString(), '/'));
+        $requestString = Mage::getSingleton('core/url')->escape(
+            ltrim(Mage::app()->getRequest()->getRequestString(), '/'));
 
         $storeUrl = Mage::app()->getStore()->isCurrentlySecure()
                 ? $this->getUrl('', array('_secure' => true))
diff --git a/app/code/core/Mage/Core/Model/Store/Group.php b/app/code/core/Mage/Core/Model/Store/Group.php
index 34d5c19c27..1ab547a694 100644
--- a/app/code/core/Mage/Core/Model/Store/Group.php
+++ b/app/code/core/Mage/Core/Model/Store/Group.php
@@ -210,7 +210,7 @@ public function getStoresCount()
      */
     public function getDefaultStore()
     {
-        if (!$this->getDefaultStoreId()) {
+        if (!$this->hasDefaultStoreId()) {
             return false;
         }
         if (is_null($this->_stores)) {
diff --git a/app/code/core/Mage/Core/Model/Website.php b/app/code/core/Mage/Core/Model/Website.php
index b1cb54d623..de08592bf9 100644
--- a/app/code/core/Mage/Core/Model/Website.php
+++ b/app/code/core/Mage/Core/Model/Website.php
@@ -307,7 +307,7 @@ public function getGroupsCount()
      */
     public function getDefaultGroup()
     {
-        if (!$this->getDefaultGroupId()) {
+        if (!$this->hasDefaultGroupId()) {
             return false;
         }
         if (is_null($this->_groups)) {
@@ -481,7 +481,9 @@ protected function _afterDelete()
      */
     public function getBaseCurrencyCode()
     {
-        if ($this->getConfig(Mage_Core_Model_Store::XML_PATH_PRICE_SCOPE) == Mage_Core_Model_Store::PRICE_SCOPE_GLOBAL) {
+        if ($this->getConfig(Mage_Core_Model_Store::XML_PATH_PRICE_SCOPE)
+            == Mage_Core_Model_Store::PRICE_SCOPE_GLOBAL
+        ) {
             return Mage::app()->getBaseCurrencyCode();
         } else {
             return $this->getConfig(Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE);
diff --git a/app/code/core/Mage/Core/controllers/AjaxController.php b/app/code/core/Mage/Core/controllers/AjaxController.php
index 6f1a595e6b..b8b9c11be2 100644
--- a/app/code/core/Mage/Core/controllers/AjaxController.php
+++ b/app/code/core/Mage/Core/controllers/AjaxController.php
@@ -41,6 +41,14 @@ public function translateAction ()
     {
         $translation = $this->getRequest()->getPost('translate');
         $area = $this->getRequest()->getPost('area');
+
+        //filtering
+        /** @var $filter Mage_Core_Model_Input_Filter_MaliciousCode */
+        $filter = Mage::getModel('core/input_filter_maliciousCode');
+        foreach ($translation as &$item) {
+            $item['custom'] = $filter->filter($item['custom']);
+        }
+
         echo Mage::helper('core/translate')->apply($translation, $area);
         exit();
     }
diff --git a/app/code/core/Mage/Core/etc/config.xml b/app/code/core/Mage/Core/etc/config.xml
index 479cd7be47..a44436985a 100644
--- a/app/code/core/Mage/Core/etc/config.xml
+++ b/app/code/core/Mage/Core/etc/config.xml
@@ -246,6 +246,11 @@
             <media_storage_configuration>
                 <media_storage>0</media_storage>
                 <media_database>default_setup</media_database>
+                <configuration_update_time>3600</configuration_update_time>
+                <allowed_resources>
+                    <compiled_css_folder>css</compiled_css_folder>
+                    <compiled_js_folder>js</compiled_js_folder>
+                </allowed_resources>
             </media_storage_configuration>
         </system>
 
@@ -346,6 +351,39 @@
                 <firstday>0</firstday>
                 <weekend>0,6</weekend>
             </locale>
+            <file>
+                <protected_extensions>
+                    <!-- PHP script file extension -->
+                    <php>php</php>
+                    <!-- File extension of configuration of an Apache Web server -->
+                    <htaccess>htaccess</htaccess>
+                    <!-- Java script file extension -->
+                    <jsp>jsp</jsp>
+                    <!-- Perl script file extension -->
+                    <pl>pl</pl>
+                    <!-- Python script file extension -->
+                    <py>py</py>
+                    <!-- Active Server Page script file extension -->
+                    <asp>asp</asp>
+                    <!-- UNIX command prompt file extension -->
+                    <sh>sh</sh>
+                    <!-- Common Gateway Interface script extension type -->
+                    <cgi>cgi</cgi>
+                    <!-- BOF HTML file extensions -->
+                    <htm>htm</htm>
+                    <html>html</html>
+                    <phtml>phtml</phtml>
+                    <shtml>shtml</shtml>
+                    <!-- EOF HTML file extensions -->
+                </protected_extensions>
+
+                <!-- Valid Paths to make public files -->
+                <public_files_valid_paths>
+                    <protected>
+                        <app>/app/*/*</app>
+                    </protected>
+                </public_files_valid_paths>
+            </file>
         </general>
     </default>
     <stores> <!-- declare routers for installation process -->
diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml
index 793080cc72..2e4a936edc 100644
--- a/app/code/core/Mage/Core/etc/system.xml
+++ b/app/code/core/Mage/Core/etc/system.xml
@@ -500,6 +500,26 @@
                         </template_hints_blocks>
                     </fields>
                 </debug>
+                <template translate="label">
+                    <label>Template Settings</label>
+                    <frontend_type>text</frontend_type>
+                    <sort_order>25</sort_order>
+                    <show_in_default>1</show_in_default>
+                    <show_in_website>1</show_in_website>
+                    <show_in_store>1</show_in_store>
+                    <fields>
+                        <allow_symlink translate="label comment">
+                            <label>Allow Symlinks</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>10</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                            <comment>Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.</comment>
+                        </allow_symlink>
+                    </fields>
+                </template>
                 <translate_inline translate="label">
                     <label>Translate Inline</label>
                     <frontend_type>text</frontend_type>
@@ -667,6 +687,7 @@
                             <label>Timezone</label>
                             <frontend_type>select</frontend_type>
                             <source_model>adminhtml/system_config_source_locale_timezone</source_model>
+                            <backend_model>adminhtml/system_config_backend_locale_timezone</backend_model>
                             <sort_order>1</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
@@ -832,7 +853,6 @@
                         </return_path_email>
                     </fields>
                 </smtp>
-                <!-- DISABLED AS NOT COMPLETED FEATURE. DO NOT ENABLE IT
                 <media_storage_configuration translate="label" module="core">
                     <label>Storage Configuration for Media</label>
                     <frontend_type>text</frontend_type>
@@ -868,13 +888,20 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
-                            <comment>When changing media storage or selecting another media database,
-                                use the Synchronize function to transfer media to the selected
-                                storage. After synchronization is completed, all new media will be
-                                automatically placed to the selected media storage.</comment>
+                            <comment>After selecting a new media storage location, press the Synchronize button
+                                to transfer all media to that location. Media will not be available in the new
+                                location until the synchronization process is complete.</comment>
                         </synchronize>
+                        <configuration_update_time translate="label">
+                            <label>Environment Update Time</label>
+                            <frontend_type>text</frontend_type>
+                            <sort_order>400</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>0</show_in_website>
+                            <show_in_store>0</show_in_store>
+                        </configuration_update_time>
                     </fields>
-                </media_storage_configuration> -->
+                </media_storage_configuration>
             </groups>
         </system>
         <admin translate="label" module="core">
diff --git a/app/code/core/Mage/Customer/Block/Address/Edit.php b/app/code/core/Mage/Customer/Block/Address/Edit.php
index 427a05b39f..8d3b5fdb69 100644
--- a/app/code/core/Mage/Customer/Block/Address/Edit.php
+++ b/app/code/core/Mage/Customer/Block/Address/Edit.php
@@ -50,6 +50,14 @@ protected function _prepareLayout()
             }
         }
 
+        if (!$this->_address->getId()) {
+            $this->_address->setPrefix($this->getCustomer()->getPrefix())
+                ->setFirstname($this->getCustomer()->getFirstname())
+                ->setMiddlename($this->getCustomer()->getMiddlename())
+                ->setLastname($this->getCustomer()->getLastname())
+                ->setSuffix($this->getCustomer()->getSuffix());
+        }
+
         if ($headBlock = $this->getLayout()->getBlock('head')) {
             $headBlock->setTitle($this->getTitle());
         }
@@ -58,6 +66,20 @@ protected function _prepareLayout()
         }
     }
 
+    /**
+     * Generate name block html
+     *
+     * @return string
+     */
+    public function getNameBlockHtml()
+    {
+        $nameBlock = $this->getLayout()
+            ->createBlock('customer/widget_name')
+            ->setObject($this->getAddress());
+
+        return $nameBlock->toHtml();
+    }
+
     public function getTitle()
     {
         if ($title = $this->getData('title')) {
@@ -131,12 +153,14 @@ public function canSetAsDefaultShipping()
 
     public function isDefaultBilling()
     {
-        return $this->getAddress()->getId() && $this->getAddress()->getId()==Mage::getSingleton('customer/session')->getCustomer()->getDefaultBilling();
+        $defaultBilling = Mage::getSingleton('customer/session')->getCustomer()->getDefaultBilling();
+        return $this->getAddress()->getId() && $this->getAddress()->getId() == $defaultBilling;
     }
 
     public function isDefaultShipping()
     {
-        return $this->getAddress()->getId() && $this->getAddress()->getId()==Mage::getSingleton('customer/session')->getCustomer()->getDefaultShipping();
+        $defaultShipping = Mage::getSingleton('customer/session')->getCustomer()->getDefaultShipping();
+        return $this->getAddress()->getId() && $this->getAddress()->getId() == $defaultShipping;
     }
 
     public function getCustomer()
@@ -145,7 +169,7 @@ public function getCustomer()
     }
 
     public function getBackButtonUrl()
-    {//echo '=>'.$this->getCustomerAddressCount();die();
+    {
         if ($this->getCustomerAddressCount()) {
             return $this->getUrl('customer/address');
         } else {
diff --git a/app/code/core/Mage/Customer/Block/Widget/Name.php b/app/code/core/Mage/Customer/Block/Widget/Name.php
index cb22b74a78..27a5cd784e 100644
--- a/app/code/core/Mage/Customer/Block/Widget/Name.php
+++ b/app/code/core/Mage/Customer/Block/Widget/Name.php
@@ -59,52 +59,81 @@ public function showPrefix()
         return (bool)$this->_getAttribute('prefix')->getIsVisible();
     }
 
+    /**
+     * Define if prefix attribute is required
+     *
+     * @return bool
+     */
     public function isPrefixRequired()
     {
         return (bool)$this->_getAttribute('prefix')->getIsRequired();
     }
 
+    /**
+     * Retrieve name prefix dropdown options
+     *
+     * @return array|bool
+     */
     public function getPrefixOptions()
     {
-        $options = trim($this->getConfig('prefix_options'));
-        if (!$options) {
-            return false;
+        $prefixOptions = $this->helper('customer')->getNamePrefixOptions();
+        if ($this->getObject() && !empty($prefixOptions)) {
+            $oldPrefix = $this->escapeHtml(trim($this->getObject()->getPrefix()));
+            $prefixOptions[$oldPrefix] = $oldPrefix;
         }
-        $options = explode(';', $options);
-        foreach ($options as &$v) {
-            $v = $this->htmlEscape(trim($v));
-        }
-        return $options;
+        return $prefixOptions;
     }
 
+    /**
+     * Define if middle name attribute can be shown
+     *
+     * @return bool
+     */
     public function showMiddlename()
     {
         return (bool)$this->_getAttribute('middlename')->getIsVisible();
     }
 
+    /**
+     * Define if suffix attribute can be shown
+     *
+     * @return bool
+     */
     public function showSuffix()
     {
         return (bool)$this->_getAttribute('suffix')->getIsVisible();
     }
 
+    /**
+     * Define if suffix attribute is required
+     *
+     * @return bool
+     */
     public function isSuffixRequired()
     {
         return (bool)$this->_getAttribute('suffix')->getIsRequired();
     }
 
+    /**
+     * Retrieve name suffix dropdown options
+     *
+     * @return array|bool
+     */
     public function getSuffixOptions()
     {
-        $options = trim($this->getConfig('suffix_options'));
-        if (!$options) {
-            return false;
-        }
-        $options = explode(';', $options);
-        foreach ($options as &$v) {
-            $v = $this->htmlEscape(trim($v));
+        $suffixOptions = $this->helper('customer')->getNameSuffixOptions();
+        if ($this->getObject() && !empty($suffixOptions)) {
+            $oldSuffix = $this->escapeHtml(trim($this->getObject()->getSuffix()));
+            $suffixOptions[$oldSuffix] = $oldSuffix;
         }
-        return $options;
+        return $suffixOptions;
     }
 
+    /**
+     * Class name getter
+     *
+     * @return string
+     */
     public function getClassName()
     {
         if (!$this->hasData('class_name')) {
@@ -113,6 +142,11 @@ public function getClassName()
         return $this->getData('class_name');
     }
 
+    /**
+     * Container class name getter
+     *
+     * @return string
+     */
     public function getContainerClassName()
     {
         $class = $this->getClassName();
diff --git a/app/code/core/Mage/Customer/Helper/Data.php b/app/code/core/Mage/Customer/Helper/Data.php
index b6ea66e050..a0dc9242d1 100644
--- a/app/code/core/Mage/Customer/Helper/Data.php
+++ b/app/code/core/Mage/Customer/Helper/Data.php
@@ -131,7 +131,7 @@ public function getLoginUrl()
 
         if (!$referer && !Mage::getStoreConfigFlag('customer/startup/redirect_dashboard')) {
             if (!Mage::getSingleton('customer/session')->getNoReferer()) {
-                $referer = Mage::getUrl('*/*/*', array('_current' => true));
+                $referer = Mage::getUrl('*/*/*', array('_current' => true, '_use_rewrite' => true));
                 $referer = Mage::helper('core')->urlEncode($referer);
             }
         }
@@ -151,7 +151,9 @@ public function getLoginPostUrl()
     {
         $params = array();
         if ($this->_getRequest()->getParam(self::REFERER_QUERY_PARAM_NAME)) {
-            $params = array(self::REFERER_QUERY_PARAM_NAME => $this->_getRequest()->getParam(self::REFERER_QUERY_PARAM_NAME));
+            $params = array(
+                self::REFERER_QUERY_PARAM_NAME => $this->_getRequest()->getParam(self::REFERER_QUERY_PARAM_NAME)
+            );
         }
         return $this->_getUrl('customer/account/loginPost', $params);
     }
@@ -268,4 +270,49 @@ public function isRegistrationAllowed()
         Mage::dispatchEvent('customer_registration_is_allowed', array('result' => $result));
         return $result->getIsAllowed();
     }
+
+    /**
+     * Retrieve name prefix dropdown options
+     *
+     * @return array|bool
+     */
+    public function getNamePrefixOptions($store = null)
+    {
+        return $this->_prepareNamePrefixSuffixOptions(
+            Mage::helper('customer/address')->getConfig('prefix_options', $store)
+        );
+    }
+
+    /**
+     * Retrieve name suffix dropdown options
+     *
+     * @return array|bool
+     */
+    public function getNameSuffixOptions($store = null)
+    {
+        return $this->_prepareNamePrefixSuffixOptions(
+            Mage::helper('customer/address')->getConfig('suffix_options', $store)
+        );
+    }
+
+    /**
+     * Unserialize and clear name prefix or suffix options
+     *
+     * @param string $options
+     * @return array|bool
+     */
+    protected function _prepareNamePrefixSuffixOptions($options)
+    {
+        $options = trim($options);
+        if (empty($options)) {
+            return false;
+        }
+        $result = array();
+        $options = explode(';', $options);
+        foreach ($options as $value) {
+            $value = $this->escapeHtml(trim($value));
+            $result[$value] = $value;
+        }
+        return $result;
+    }
 }
diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Abstract.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Abstract.php
index ea147e57c3..9bfd5fba52 100644
--- a/app/code/core/Mage/Customer/Model/Attribute/Data/Abstract.php
+++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Abstract.php
@@ -29,7 +29,7 @@
  * Customer Attribute Abstract Data Model
  *
  * @category    Mage
- * @package     Mage_package
+ * @package     Mage_Customer
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 abstract class Mage_Customer_Model_Attribute_Data_Abstract
@@ -277,7 +277,7 @@ protected function _validateInputRule($value)
             return true;
         }
 
-        $label         = $this->getAttribute()->getStoreLabel();
+        $label         = Mage::helper('customer')->__($this->getAttribute()->getStoreLabel());
         $validateRules = $this->getAttribute()->getValidateRules();
 
         if (!empty($validateRules['input_validation'])) {
@@ -337,6 +337,19 @@ protected function _validateInputRule($value)
                     }
                     break;
                 case 'email':
+        /**
+        $this->__("'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded")
+        $this->__("Invalid type given. String expected")
+        $this->__("'%value%' appears to be a DNS hostname but contains a dash in an invalid position")
+        $this->__("'%value%' does not match the expected structure for a DNS hostname")
+        $this->__("'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'")
+        $this->__("'%value%' does not appear to be a valid local network name")
+        $this->__("'%value%' does not appear to be a valid URI hostname")
+        $this->__("'%value%' appears to be an IP address, but IP addresses are not allowed")
+        $this->__("'%value%' appears to be a local network name but local network names are not allowed")
+        $this->__("'%value%' appears to be a DNS hostname but cannot extract TLD part")
+        $this->__("'%value%' appears to be a DNS hostname but cannot match TLD against known list")
+        */
                     $validator = new Zend_Validate_EmailAddress();
                     $validator->setMessage(
                         Mage::helper('customer')->__('"%s" invalid type entered.', $label),
@@ -374,6 +387,38 @@ protected function _validateInputRule($value)
                         Mage::helper('customer')->__('"%s" exceeds the allowed length.', $label),
                         Zend_Validate_EmailAddress::LENGTH_EXCEEDED
                     );
+                    $validator->setMessage(
+                        Mage::helper('customer')->__("'%value%' appears to be an IP address, but IP addresses are not allowed"),
+                        Zend_Validate_Hostname::IP_ADDRESS_NOT_ALLOWED
+                    );
+                    $validator->setMessage(
+                        Mage::helper('customer')->__("'%value%' appears to be a DNS hostname but cannot match TLD against known list"),
+                        Zend_Validate_Hostname::UNKNOWN_TLD
+                    );
+                    $validator->setMessage(
+                        Mage::helper('customer')->__("'%value%' appears to be a DNS hostname but contains a dash in an invalid position"),
+                        Zend_Validate_Hostname::INVALID_DASH
+                    );
+                    $validator->setMessage(
+                        Mage::helper('customer')->__("'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'"),
+                        Zend_Validate_Hostname::INVALID_HOSTNAME_SCHEMA
+                    );
+                    $validator->setMessage(
+                        Mage::helper('customer')->__("'%value%' appears to be a DNS hostname but cannot extract TLD part"),
+                        Zend_Validate_Hostname::UNDECIPHERABLE_TLD
+                    );
+                    $validator->setMessage(
+                        Mage::helper('customer')->__("'%value%' does not appear to be a valid local network name"),
+                        Zend_Validate_Hostname::INVALID_LOCAL_NAME
+                    );
+                    $validator->setMessage(
+                        Mage::helper('customer')->__("'%value%' appears to be a local network name but local network names are not allowed"),
+                        Zend_Validate_Hostname::LOCAL_NAME_NOT_ALLOWED
+                    );
+                    $validator->setMessage(
+                        Mage::helper('customer')->__("'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded"),
+                        Zend_Validate_Hostname::CANNOT_DECODE_PUNYCODE
+                    );
                     if (!$validator->isValid($value)) {
                         return array_unique($validator->getMessages());
                     }
@@ -389,8 +434,8 @@ protected function _validateInputRule($value)
                     }
                     break;
                 case 'date':
-                    $format = Mage::app()->getLocale()->getDateFormat(Varien_Date::DATE_INTERNAL_FORMAT);
-                    $validator = new Zend_Validate_Date($format);
+                    $validator = new Zend_Validate_Date(Varien_Date::DATE_INTERNAL_FORMAT);
+
                     $validator->setMessage(
                         Mage::helper('customer')->__('"%s" invalid type entered.', $label),
                         Zend_Validate_Date::INVALID
@@ -403,6 +448,10 @@ protected function _validateInputRule($value)
                         Mage::helper('customer')->__('"%s" does not fit the entered date format.', $label),
                         Zend_Validate_Date::FALSEFORMAT
                     );
+                    if (!$validator->isValid($value)) {
+                       return array_unique($validator->getMessages());
+                    }
+
                     break;
             }
         }
diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Date.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Date.php
index fd40290a7f..b904b6453b 100644
--- a/app/code/core/Mage/Customer/Model/Attribute/Data/Date.php
+++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Date.php
@@ -57,7 +57,7 @@ public function validateValue($value)
     {
         $errors     = array();
         $attribute  = $this->getAttribute();
-        $label      = $attribute->getStoreLabel();
+        $label      = Mage::helper('customer')->__($attribute->getStoreLabel());
 
         if ($value === false) {
             // try to load original value and validate it
@@ -76,6 +76,31 @@ public function validateValue($value)
         if ($result !== true) {
             $errors = array_merge($errors, $result);
         }
+
+        //range validation
+        $validateRules = $attribute->getValidateRules();
+        if ((!empty($validateRules['date_range_min']) && (strtotime($value) < $validateRules['date_range_min']))
+            || (!empty($validateRules['date_range_max']) && (strtotime($value) > $validateRules['date_range_max']))) {
+
+            if (!empty($validateRules['date_range_min']) && !empty($validateRules['date_range_max'])) {
+                $errors[] = Mage::helper('customer')->__('Please enter a valid date between %s and %s at %s.',
+                    date('d/m/Y', $validateRules['date_range_min']),
+                    date('d/m/Y', $validateRules['date_range_max']),
+                    $label
+                );
+            } elseif (!empty($validateRules['date_range_min'])) {
+                $errors[] = Mage::helper('customer')->__('Please enter a valid date equal to or greater than %s at %s.',
+                    date('d/m/Y', $validateRules['date_range_min']),
+                    $label
+                );
+            } elseif (!empty($validateRules['date_range_max'])) {
+                $errors[] = Mage::helper('customer')->__('Please enter a valid date less than or equal to %s at %s.',
+                    date('d/m/Y', $validateRules['date_range_max']),
+                    $label
+                );
+            }
+        }
+
         if (count($errors) == 0) {
             return true;
         }
diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/File.php b/app/code/core/Mage/Customer/Model/Attribute/Data/File.php
index dd27ca00b1..25686d28f2 100644
--- a/app/code/core/Mage/Customer/Model/Attribute/Data/File.php
+++ b/app/code/core/Mage/Customer/Model/Attribute/Data/File.php
@@ -34,6 +34,13 @@
  */
 class Mage_Customer_Model_Attribute_Data_File extends Mage_Customer_Model_Attribute_Data_Abstract
 {
+    /**
+     * Validator for check not protected extensions
+     *
+     * @var Mage_Core_Model_File_Validator_NotProtectedExtension
+     */
+    protected $_validatorNotProtectedExtensions;
+
     /**
      * Extract data from request and return value
      *
@@ -100,10 +107,11 @@ public function extractValue(Zend_Controller_Request_Http $request)
      */
     protected function _validateByRules($value)
     {
-        $label  = $this->getAttribute()->getStoreLabel();
+        $label  = Mage::helper('customer')->__($this->getAttribute()->getStoreLabel());
         $rules  = $this->getAttribute()->getValidateRules();
+        $extension  = pathinfo($value['name'], PATHINFO_EXTENSION);
+
         if (!empty($rules['file_extensions'])) {
-            $extension  = pathinfo($value['name'], PATHINFO_EXTENSION);
             $extensions = explode(',', $rules['file_extensions']);
             $extensions = array_map('trim', $extensions);
             if (!in_array($extension, $extensions)) {
@@ -113,6 +121,15 @@ protected function _validateByRules($value)
             }
         }
 
+        /**
+         * Check protected file extension
+         */
+        /** @var $validator Mage_Core_Model_File_Validator_NotProtectedExtension */
+        $validator = Mage::getSingleton('core/file_validator_notProtectedExtension');
+        if (!$validator->isValid($extension)) {
+            return $validator->getMessages();
+        }
+
         if (!is_uploaded_file($value['tmp_name'])) {
             return array(
                 Mage::helper('customer')->__('"%s" is not a valid file.', $label)
@@ -142,24 +159,24 @@ public function validateValue($value)
     {
         $errors     = array();
         $attribute  = $this->getAttribute();
-        $label      = $attribute->getStoreLabel();
+        $label      = Mage::helper('customer')->__($attribute->getStoreLabel());
 
         if (is_array($value)) {
             $toDelete   = !empty($value['delete']) ? true : false;
             $toUpload   = !empty($value['tmp_name']) ? true : false;
-        
+
             if (!$toUpload && !$toDelete && $this->getEntity()->getData($attribute->getAttributeCode())) {
                 return true;
             }
-        
+
             if (!$attribute->getIsRequired() && !$toUpload) {
                 return true;
             }
-        
+
             if ($attribute->getIsRequired() && !$toUpload) {
                 $errors[] = Mage::helper('customer')->__('"%s" is a required value.', $label);
             }
-        
+
             if ($toUpload) {
                 $errors = array_merge($errors, $this->_validateByRules($value));
             }
@@ -169,7 +186,7 @@ public function validateValue($value)
                 $errors[] = Mage::helper('customer')->__('"%s" is a required value.', $label);
             }
         }
-        
+
         if (count($errors) == 0) {
             return true;
         }
diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Image.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Image.php
index 81db30f491..e06c2dbe04 100644
--- a/app/code/core/Mage/Customer/Model/Attribute/Data/Image.php
+++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Image.php
@@ -43,7 +43,7 @@ class Mage_Customer_Model_Attribute_Data_Image extends Mage_Customer_Model_Attri
      */
     protected function _validateByRules($value)
     {
-        $label  = $this->getAttribute()->getStoreLabel();
+        $label  = Mage::helper('customer')->__($this->getAttribute()->getStoreLabel());
         $rules  = $this->getAttribute()->getValidateRules();
 
         $imageProp = @getimagesize($value['tmp_name']);
diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Multiline.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Multiline.php
index 9653b59822..78c0915c47 100644
--- a/app/code/core/Mage/Customer/Model/Attribute/Data/Multiline.php
+++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Multiline.php
@@ -71,6 +71,9 @@ public function validateValue($value)
             }
         }
 
+        if (!is_array($value)) {
+            $value = array($value);
+        }
         for ($i = 0; $i < $attribute->getMultilineCount(); $i ++) {
             if (!isset($value[$i])) {
                 $value[$i] = null;
diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Select.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Select.php
index 1c474c1749..d65d5bc4ca 100644
--- a/app/code/core/Mage/Customer/Model/Attribute/Data/Select.php
+++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Select.php
@@ -56,7 +56,7 @@ public function validateValue($value)
     {
         $errors     = array();
         $attribute  = $this->getAttribute();
-        $label      = $attribute->getStoreLabel();
+        $label      = Mage::helper('customer')->__($attribute->getStoreLabel());
 
         if ($value === false) {
             // try to load original value and validate it
diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Text.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Text.php
index a6f900a2d7..de23cba6c9 100644
--- a/app/code/core/Mage/Customer/Model/Attribute/Data/Text.php
+++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Text.php
@@ -57,7 +57,7 @@ public function validateValue($value)
     {
         $errors     = array();
         $attribute  = $this->getAttribute();
-        $label      = $attribute->getStoreLabel();
+        $label      = Mage::helper('customer')->__($attribute->getStoreLabel());
 
         if ($value === false) {
             // try to load original value and validate it
diff --git a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
index fcd59d1469..07b687d432 100644
--- a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
@@ -534,7 +534,11 @@ public function unparse__OLD()
                 }
                 $subscriber = Mage::getModel('newsletter/subscriber')->loadByCustomer($model);
                 if ($subscriber->getId()) {
-                    $row['is_subscribed'] = $subscriber->getSubscriberStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED ? Mage_Customer_Model_Customer::SUBSCRIBED_YES : Mage_Customer_Model_Customer::SUBSCRIBED_NO;
+                    if ($subscriber->getSubscriberStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED) {
+                        $row['is_subscribed'] = Mage_Customer_Model_Customer::SUBSCRIBED_YES;
+                    } else {
+                        $row['is_subscribed'] = Mage_Customer_Model_Customer::SUBSCRIBED_NO;
+                    }
                 }
                 if(!isset($row['created_in'])){
                     $row['created_in'] = 'Admin';
@@ -658,13 +662,15 @@ public function parse()
 
 
                     if (!$billingAddress  instanceof Mage_Customer_Model_Address) {
-                        $billingAddress = new Mage_Customer_Model_Address();
+                        $billingAddress = Mage::getModel('customer/address');
                         if ($customer->getId() && $customer->getDefaultBilling()) {
                             $billingAddress->setId($customer->getDefaultBilling());
                         }
                     }
 
-                    $regions = Mage::getResourceModel('directory/region_collection')->addRegionNameFilter($row['billing_region'])->load();
+                    $regions = Mage::getResourceModel('directory/region_collection')
+                        ->addRegionNameFilter($row['billing_region'])
+                        ->load();
                     if ($regions) foreach($regions as $region) {
                        $regionId = $region->getId();
                     }
@@ -699,13 +705,15 @@ public function parse()
 
                     $shippingAddress = $model->getPrimaryShippingAddress();
                     if (!$shippingAddress instanceof Mage_Customer_Model_Address) {
-                        $shippingAddress = new Mage_Customer_Model_Address();
+                        $shippingAddress = Mage::getModel('customer/address');
                         if ($customer->getId() && $customer->getDefaultShipping()) {
                             $shippingAddress->setId($customer->getDefaultShipping());
                         }
                     }
 
-                    $regions = Mage::getResourceModel('directory/region_collection')->addRegionNameFilter($row['shipping_region'])->load();
+                    $regions = Mage::getResourceModel('directory/region_collection')
+                        ->addRegionNameFilter($row['shipping_region'])
+                        ->load();
                     if ($regions) foreach($regions as $region) {
                        $regionId = $region->getId();
                     }
diff --git a/app/code/core/Mage/Customer/Model/Customer.php b/app/code/core/Mage/Customer/Model/Customer.php
index da2ae96a25..44989477d3 100644
--- a/app/code/core/Mage/Customer/Model/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Customer.php
@@ -332,7 +332,7 @@ public function hashPassword($password, $salt=null)
      */
     public function generatePassword($length=6)
     {
-        return substr(md5(uniqid(rand(), true)), 0, $length);
+        return Mage::helper('core')->getRandomString($length);
     }
 
     /**
@@ -543,7 +543,8 @@ public function isConfirmationRequired()
             return false;
         }
         if (null === self::$_isConfirmationRequired) {
-            self::$_isConfirmationRequired = 1 == Mage::getStoreConfig(self::XML_PATH_IS_CONFIRM, ($this->getStoreId() ? $this->getStoreId() : null));
+            $storeId = $this->getStoreId() ? $this->getStoreId() : null;
+            self::$_isConfirmationRequired = 1 == Mage::getStoreConfig(self::XML_PATH_IS_CONFIRM, $storeId);
         }
         return self::$_isConfirmationRequired;
     }
@@ -855,7 +856,7 @@ public function importFromTextArray(array $row)
             // Handling billing address
             $billingAddress = $this->getPrimaryBillingAddress();
             if (!$billingAddress  instanceof Mage_Customer_Model_Address) {
-                $billingAddress = new Mage_Customer_Model_Address();
+                $billingAddress = Mage::getModel('customer/address');
             }
 
             $regions->addRegionNameFilter($row['billing_region'])->load();
@@ -894,7 +895,7 @@ public function importFromTextArray(array $row)
             // Handling shipping address
             $shippingAddress = $this->getPrimaryShippingAddress();
             if (!$shippingAddress instanceof Mage_Customer_Model_Address) {
-                $shippingAddress = new Mage_Customer_Model_Address();
+                $shippingAddress = Mage::getModel('customer/address');
             }
 
             $regions->addRegionNameFilter($row['shipping_region'])->load();
diff --git a/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php
index 0e6e32bc31..3ddef3625b 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php
@@ -34,6 +34,11 @@
  */
 class Mage_Customer_Model_Entity_Attribute_Collection extends Mage_Eav_Model_Mysql4_Entity_Attribute_Collection
 {
+    /**
+     * code of password hash in customer's EAV tables
+     */
+    const EAV_CODE_PASSWORD_HASH = 'password_hash';
+
     /**
      * Current website scope instance
      *
@@ -199,6 +204,19 @@ public function addSystemHiddenFilter()
         return $this;
     }
 
+    /**
+     * Exclude system hidden attributes but include password hash
+     *
+     * @return Mage_Customer_Model_Entity_Attribute_Collection
+     */
+    public function addSystemHiddenFilterWithPasswordHash()
+    {
+        $field = '(CASE WHEN additional_table.is_system = 1 AND additional_table.is_visible = 0
+            AND main_table.attribute_code != "' . self::EAV_CODE_PASSWORD_HASH . '" THEN 1 ELSE 0 END)';
+        $this->addFieldToFilter($field, 0);
+        return $this;
+    }
+
     /**
      * Add exclude hidden frontend input attribute filter to collection
      *
diff --git a/app/code/core/Mage/Customer/Model/Group.php b/app/code/core/Mage/Customer/Model/Group.php
index 1316aa2138..eb88871f35 100644
--- a/app/code/core/Mage/Customer/Model/Group.php
+++ b/app/code/core/Mage/Customer/Model/Group.php
@@ -31,6 +31,9 @@
  */
 class Mage_Customer_Model_Group extends Mage_Core_Model_Abstract
 {
+    /**
+     * Xml config path for create account default group
+     */
     const XML_PATH_DEFAULT_ID       = 'customer/create_account/default_group';
 
     const NOT_LOGGED_IN_ID          = 0;
diff --git a/app/code/core/Mage/Customer/Model/Session.php b/app/code/core/Mage/Customer/Model/Session.php
index d330e14517..d71c7a3762 100644
--- a/app/code/core/Mage/Customer/Model/Session.php
+++ b/app/code/core/Mage/Customer/Model/Session.php
@@ -176,11 +176,13 @@ public function checkCustomerId($customerId)
      */
     public function login($username, $password)
     {
+        /** @var $customer Mage_Customer_Model_Customer */
         $customer = Mage::getModel('customer/customer')
             ->setWebsiteId(Mage::app()->getStore()->getWebsiteId());
 
         if ($customer->authenticate($username, $password)) {
             $this->setCustomerAsLoggedIn($customer);
+            $this->renewSession();
             return true;
         }
         return false;
diff --git a/app/code/core/Mage/Customer/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php
index 844f75ce04..e48fc411ae 100644
--- a/app/code/core/Mage/Customer/controllers/AccountController.php
+++ b/app/code/core/Mage/Customer/controllers/AccountController.php
@@ -38,7 +38,7 @@ class Mage_Customer_AccountController extends Mage_Core_Controller_Front_Action
      *
      * @var array
      */
-    protected $_cookieCheckActions = array('loginPost', 'create');
+    protected $_cookieCheckActions = array('loginPost', 'createpost');
 
     /**
      * Retrieve customer session model object
@@ -66,7 +66,8 @@ public function preDispatch()
         }
 
         $action = $this->getRequest()->getActionName();
-        if (!preg_match('/^(create|login|logoutSuccess|forgotpassword|forgotpasswordpost|confirm|confirmation)/i', $action)) {
+        $pattern = '/^(create|login|logoutSuccess|forgotpassword|forgotpasswordpost|confirm|confirmation)/i';
+        if (!preg_match($pattern, $action)) {
             if (!$this->_getSession()->authenticate($this)) {
                 $this->setFlag('', 'no-dispatch', true);
             }
@@ -140,7 +141,8 @@ public function loginPostAction()
                 } catch (Mage_Core_Exception $e) {
                     switch ($e->getCode()) {
                         case Mage_Customer_Model_Customer::EXCEPTION_EMAIL_NOT_CONFIRMED:
-                            $message = Mage::helper('customer')->__('This account is not confirmed. <a href="%s">Click here</a> to resend confirmation email.', Mage::helper('customer')->getEmailConfirmationUrl($login['username']));
+                            $value = Mage::helper('customer')->getEmailConfirmationUrl($login['username']);
+                            $message = Mage::helper('customer')->__('This account is not confirmed. <a href="%s">Click here</a> to resend confirmation email.', $value);
                             break;
                         case Mage_Customer_Model_Customer::EXCEPTION_INVALID_EMAIL_OR_PASSWORD:
                             $message = $e->getMessage();
@@ -365,7 +367,9 @@ public function createPostAction()
      */
     protected function _welcomeCustomer(Mage_Customer_Model_Customer $customer, $isJustConfirmed = false)
     {
-        $this->_getSession()->addSuccess($this->__('Thank you for registering with %s.', Mage::app()->getStore()->getFrontendName()));
+        $this->_getSession()->addSuccess(
+            $this->__('Thank you for registering with %s.', Mage::app()->getStore()->getFrontendName())
+        );
 
         $customer->sendNewAccountEmail($isJustConfirmed ? 'confirmed' : 'registered');
 
@@ -579,10 +583,10 @@ public function editPostAction()
         }
 
         if ($this->getRequest()->isPost()) {
-            /* @var $customer Mage_Customer_Model_Customer */
+            /** @var $customer Mage_Customer_Model_Customer */
             $customer = $this->_getSession()->getCustomer();
 
-            /* @var $customerForm Mage_Customer_Model_Form */
+            /** @var $customerForm Mage_Customer_Model_Form */
             $customerForm = Mage::getModel('customer/form');
             $customerForm->setFormCode('customer_account_edit')
                 ->setEntity($customer);
@@ -612,7 +616,10 @@ public function editPostAction()
 
                     if ($customer->hashPassword($currPass, $salt) == $oldPass) {
                         if (strlen($newPass)) {
-                            // Set entered password and its confirmation - they will be validated later to match each other and be of right length
+                            /**
+                             * Set entered password and its confirmation - they
+                             * will be validated later to match each other and be of right length
+                             */
                             $customer->setPassword($newPass);
                             $customer->setConfirmation($confPass);
                         } else {
diff --git a/app/code/core/Mage/Customer/etc/api.xml b/app/code/core/Mage/Customer/etc/api.xml
index 0bbec1f0e3..649de6497a 100644
--- a/app/code/core/Mage/Customer/etc/api.xml
+++ b/app/code/core/Mage/Customer/etc/api.xml
@@ -30,7 +30,7 @@
         <resources>
             <customer translate="title" module="customer">
                 <model>customer/customer_api</model>
-                <title>Customer Api</title>
+                <title>Customer API</title>
                 <acl>customer</acl>
                 <methods>
                     <list translate="title" module="customer">
@@ -76,7 +76,7 @@
             </customer>
             <customer_group>
                 <model>customer/group_api</model>
-                <title>Customer's Groups Api</title>
+                <title>Customer's Groups API</title>
                 <acl>customer</acl>
                 <methods>
                     <list translate="title" module="customer">
@@ -87,7 +87,7 @@
             </customer_group>
             <customer_address>
                 <model>customer/address_api</model>
-                <title>Customer Address Api</title>
+                <title>Customer Address API</title>
                 <acl>customer/address</acl>
                 <methods>
                     <list translate="title" module="customer">
diff --git a/app/code/core/Mage/Customer/etc/config.xml b/app/code/core/Mage/Customer/etc/config.xml
index 6e449974a2..fd80b7d8c8 100644
--- a/app/code/core/Mage/Customer/etc/config.xml
+++ b/app/code/core/Mage/Customer/etc/config.xml
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Mage_Customer>
-            <version>1.4.0.0.13</version>
+            <version>1.4.0.0.14</version>
         </Mage_Customer>
     </modules>
 
diff --git a/app/code/core/Mage/Customer/etc/wsi.xml b/app/code/core/Mage/Customer/etc/wsi.xml
new file mode 100644
index 0000000000..abef413caf
--- /dev/null
+++ b/app/code/core/Mage/Customer/etc/wsi.xml
@@ -0,0 +1,507 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:typens="urn:{{var wsdl.name}}"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+             name="{{var wsdl.name}}"
+             targetNamespace="urn:{{var wsdl.name}}">
+    <wsdl:types>
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:{{var wsdl.name}}">
+            <xsd:complexType name="customerCustomerEntityToCreate">
+                <xsd:sequence>
+                    <xsd:element name="customer_id" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="email" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="firstname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="lastname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="password" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="website_id" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="store_id" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="group_id" type="xsd:int" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="customerCustomerEntity">
+                <xsd:sequence>
+                    <xsd:element name="customer_id" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="store_id" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="website_id" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="created_in" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="email" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="firstname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="middlename" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="lastname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="group_id" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="prefix" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="suffix" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="dob" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="taxvat" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="confirmation" type="xsd:boolean" minOccurs="0" />
+                    <xsd:element name="password_hash" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="customerCustomerEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:customerCustomerEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="customerGroupEntity">
+                <xsd:sequence>
+                    <xsd:element name="customer_group_id" type="xsd:int" />
+                    <xsd:element name="customer_group_code" type="xsd:string" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="customerGroupEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:customerGroupEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="customerAddressEntityCreate">
+                <xsd:sequence>
+                    <xsd:element name="city" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="company" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="country_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="fax" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="firstname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="lastname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="middlename" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="postcode" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="prefix" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="region_id" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="region" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="street" type="typens:ArrayOfString" minOccurs="0" />
+                    <xsd:element name="suffix" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="telephone" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_default_billing" type="xsd:boolean" minOccurs="0" />
+                    <xsd:element name="is_default_shipping" type="xsd:boolean" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="customerAddressEntityItem">
+                <xsd:sequence>
+                    <xsd:element name="customer_address_id" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="city" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="company" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="country_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="fax" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="firstname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="lastname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="middlename" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="postcode" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="prefix" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="region" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="region_id" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="street" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="suffix" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="telephone" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_default_billing" type="xsd:boolean" minOccurs="0" />
+                    <xsd:element name="is_default_shipping" type="xsd:boolean" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="customerAddressEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:customerAddressEntityItem" />
+                </xsd:sequence>
+            </xsd:complexType>
+
+
+            <xsd:element name="customerCustomerListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="filters" type="typens:filters" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerCustomerListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:customerCustomerEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerCustomerCreateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="customerData" type="typens:customerCustomerEntityToCreate" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerCustomerCreateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerCustomerInfoRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="customerId" type="xsd:int" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="attributes" type="typens:ArrayOfString" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerCustomerInfoResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:customerCustomerEntity" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerCustomerUpdateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="customerId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="customerData" type="typens:customerCustomerEntityToCreate" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerCustomerUpdateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerCustomerDeleteRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="customerId" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerCustomerDeleteResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerGroupListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerGroupListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:customerGroupEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerAddressListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="customerId" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerAddressListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:customerAddressEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerAddressCreateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="customerId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="addressData" type="typens:customerAddressEntityCreate" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerAddressCreateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerAddressInfoRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="addressId" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerAddressInfoResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:customerAddressEntityItem" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerAddressUpdateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="addressId" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="addressData" type="typens:customerAddressEntityCreate" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerAddressUpdateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerAddressDeleteRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="addressId" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="customerAddressDeleteResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:boolean" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="customerCustomerListRequest">
+        <wsdl:part name="parameters" element="typens:customerCustomerListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="customerCustomerListResponse">
+        <wsdl:part name="parameters" element="typens:customerCustomerListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="customerCustomerCreateRequest">
+        <wsdl:part name="parameters" element="typens:customerCustomerCreateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="customerCustomerCreateResponse">
+        <wsdl:part name="parameters" element="typens:customerCustomerCreateResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="customerCustomerInfoRequest">
+        <wsdl:part name="parameters" element="typens:customerCustomerInfoRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="customerCustomerInfoResponse">
+        <wsdl:part name="parameters" element="typens:customerCustomerInfoResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="customerCustomerUpdateRequest">
+        <wsdl:part name="parameters" element="typens:customerCustomerUpdateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="customerCustomerUpdateResponse">
+        <wsdl:part name="parameters" element="typens:customerCustomerUpdateResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="customerCustomerDeleteRequest">
+        <wsdl:part name="parameters" element="typens:customerCustomerDeleteRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="customerCustomerDeleteResponse">
+        <wsdl:part name="parameters" element="typens:customerCustomerDeleteResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="customerGroupListRequest">
+        <wsdl:part name="parameters" element="typens:customerGroupListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="customerGroupListResponse">
+        <wsdl:part name="parameters" element="typens:customerGroupListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="customerAddressListRequest">
+        <wsdl:part name="parameters" element="typens:customerAddressListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="customerAddressListResponse">
+        <wsdl:part name="parameters" element="typens:customerAddressListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="customerAddressCreateRequest">
+        <wsdl:part name="parameters" element="typens:customerAddressCreateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="customerAddressCreateResponse">
+        <wsdl:part name="parameters" element="typens:customerAddressCreateResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="customerAddressInfoRequest">
+        <wsdl:part name="parameters" element="typens:customerAddressInfoRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="customerAddressInfoResponse">
+        <wsdl:part name="parameters" element="typens:customerAddressInfoResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="customerAddressUpdateRequest">
+        <wsdl:part name="parameters" element="typens:customerAddressUpdateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="customerAddressUpdateResponse">
+        <wsdl:part name="parameters" element="typens:customerAddressUpdateResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="customerAddressDeleteRequest">
+        <wsdl:part name="parameters" element="typens:customerAddressDeleteRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="customerAddressDeleteResponse">
+        <wsdl:part name="parameters" element="typens:customerAddressDeleteResponseParam" />
+    </wsdl:message>
+    <wsdl:portType name="{{var wsdl.handler}}PortType">
+        <wsdl:operation name="customerCustomerList">
+            <wsdl:documentation>Retrieve customers</wsdl:documentation>
+            <wsdl:input message="typens:customerCustomerListRequest" />
+            <wsdl:output message="typens:customerCustomerListResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="customerCustomerCreate">
+            <wsdl:documentation>Create customer</wsdl:documentation>
+            <wsdl:input message="typens:customerCustomerCreateRequest" />
+            <wsdl:output message="typens:customerCustomerCreateResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="customerCustomerInfo">
+            <wsdl:documentation>Retrieve customer data</wsdl:documentation>
+            <wsdl:input message="typens:customerCustomerInfoRequest" />
+            <wsdl:output message="typens:customerCustomerInfoResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="customerCustomerUpdate">
+            <wsdl:documentation>Update customer data</wsdl:documentation>
+            <wsdl:input message="typens:customerCustomerUpdateRequest" />
+            <wsdl:output message="typens:customerCustomerUpdateResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="customerCustomerDelete">
+            <wsdl:documentation>Delete customer</wsdl:documentation>
+            <wsdl:input message="typens:customerCustomerDeleteRequest" />
+            <wsdl:output message="typens:customerCustomerDeleteResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="customerGroupList">
+            <wsdl:documentation>Retrieve customer groups</wsdl:documentation>
+            <wsdl:input message="typens:customerGroupListRequest" />
+            <wsdl:output message="typens:customerGroupListResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="customerAddressList">
+            <wsdl:documentation>Retrieve customer addresses</wsdl:documentation>
+            <wsdl:input message="typens:customerAddressListRequest" />
+            <wsdl:output message="typens:customerAddressListResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="customerAddressCreate">
+            <wsdl:documentation>Create customer address</wsdl:documentation>
+            <wsdl:input message="typens:customerAddressCreateRequest" />
+            <wsdl:output message="typens:customerAddressCreateResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="customerAddressInfo">
+            <wsdl:documentation>Retrieve customer address data</wsdl:documentation>
+            <wsdl:input message="typens:customerAddressInfoRequest" />
+            <wsdl:output message="typens:customerAddressInfoResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="customerAddressUpdate">
+            <wsdl:documentation>Update customer address data</wsdl:documentation>
+            <wsdl:input message="typens:customerAddressUpdateRequest" />
+            <wsdl:output message="typens:customerAddressUpdateResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="customerAddressDelete">
+            <wsdl:documentation>Delete customer address</wsdl:documentation>
+            <wsdl:input message="typens:customerAddressDeleteRequest" />
+            <wsdl:output message="typens:customerAddressDeleteResponse" />
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="{{var wsdl.handler}}Binding" type="typens:{{var wsdl.handler}}PortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="customerCustomerList">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="customerCustomerCreate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="customerCustomerInfo">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="customerCustomerUpdate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="customerCustomerDelete">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="customerGroupList">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="customerAddressList">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="customerAddressCreate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="customerAddressInfo">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="customerAddressUpdate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="customerAddressDelete">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+</wsdl:definitions>
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.13-1.4.0.0.14.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.13-1.4.0.0.14.php
new file mode 100644
index 0000000000..39c71f1516
--- /dev/null
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.13-1.4.0.0.14.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Customer
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/* @var $installer Mage_Customer_Model_Entity_Setup */
+$installer = $this;
+/* @var $eavConfig Mage_Eav_Model_Config */
+$eavConfig = Mage::getSingleton('eav/config');
+
+// update customer system attributes used_in_forms data
+$attributes = array(
+    'confirmation'      => array(),
+    'default_billing'   => array(),
+    'default_shipping'  => array(),
+    'password_hash'     => array(),
+    'website_id'        => array('adminhtml_only' => 1),
+    'created_in'        => array('adminhtml_only' => 1),
+    'store_id'          => array(),
+    'group_id'          => array('adminhtml_only' => 1, 'admin_checkout' => 1),
+    'prefix'            => array(),
+    'firstname'         => array(),
+    'middlename'        => array(),
+    'lastname'          => array(),
+    'suffix'            => array(),
+    'email'             => array('admin_checkout' => 1),
+    'dob'               => array('admin_checkout' => 1),
+    'taxvat'            => array('admin_checkout' => 1),
+    'gender'            => array('admin_checkout' => 1),
+);
+
+$defaultUsedInForms = array(
+    'customer_account_create',
+    'customer_account_edit',
+    'checkout_register',
+);
+
+foreach ($attributes as $attributeCode => $data) {
+    $attribute = $eavConfig->getAttribute('customer', $attributeCode);
+    if (!$attribute) {
+        continue;
+    }
+    if (false === ($attribute->getData('is_system') == 1 && $attribute->getData('is_visible') == 0)) {
+        $usedInForms = $defaultUsedInForms;
+        if (!empty($data['adminhtml_only'])) {
+            $usedInForms = array('adminhtml_customer');
+        } else {
+            $usedInForms[] = 'adminhtml_customer';
+        }
+        if (!empty($data['admin_checkout'])) {
+            $usedInForms[] = 'adminhtml_checkout';
+        }
+        $attribute->setData('used_in_forms', $usedInForms);
+    }
+    $attribute->save();
+}
+
+// update customer address system attributes used_in_forms data
+$attributes = array(
+    'prefix', 'firstname', 'middlename', 'lastname', 'suffix', 'company', 'street', 'city', 'country_id',
+    'region', 'region_id', 'postcode', 'telephone', 'fax'
+);
+
+$defaultUsedInForms = array(
+    'adminhtml_customer_address',
+    'customer_address_edit',
+    'customer_register_address'
+);
+
+foreach ($attributes as $attributeCode) {
+    $attribute = $eavConfig->getAttribute('customer_address', $attributeCode);
+    if (!$attribute) {
+        continue;
+    }
+    if (false === ($attribute->getData('is_system') == 1 && $attribute->getData('is_visible') == 0)) {
+        $attribute->setData('used_in_forms', $defaultUsedInForms);
+    }
+    $attribute->save();
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php
index 2c8b92a871..91f279b883 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php
@@ -74,8 +74,7 @@ public function loadFile()
             exit;
         }
         if (!empty($_FILES['io_file']['tmp_name'])) {
-            //$this->setData(file_get_contents($_FILES['io_file']['tmp_name']));
-            $uploader = new Varien_File_Uploader('io_file');
+            $uploader = new Mage_Core_Model_File_Uploader('io_file');
             $uploader->setAllowedExtensions(array('csv','xml'));
             $path = Mage::app()->getConfig()->getTempVarDir().'/import/';
             $uploader->save($path);
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php
index 693aa6de1d..38f349c025 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php
@@ -49,12 +49,26 @@ public function getResource($forWrite = false)
             $ioConfig = $this->getVars();
             switch ($this->getVar('type', 'file')) {
                 case 'file':
-                    if (preg_match('#^'.preg_quote(DS, '#').'#', $this->getVar('path')) ||
-                        preg_match('#^[a-z]:'.preg_quote(DS, '#') .'#i', $this->getVar('path'))) {
+                    //validate export/import path
+                    $path = rtrim($ioConfig['path'], '\\/')
+                          . DS . $ioConfig['filename'];
+                    /** @var $validator Mage_Core_Model_File_Validator_AvailablePath */
+                    $validator = Mage::getModel('core/file_validator_availablePath');
+                    /** @var $helper Mage_ImportExport_Helper_Data */
+                    $helper = Mage::helper('importexport');
+                    $validator->setPaths($helper->getLocalValidPaths());
+                    if (!$validator->isValid($path)) {
+                        foreach ($validator->getMessages() as $message) {
+                            Mage::throwException($message);
+                            return false;
+                        }
+                    }
+
+                    if (preg_match('#^' . preg_quote(DS, '#').'#', $this->getVar('path')) ||
+                        preg_match('#^[a-z]:' . preg_quote(DS, '#') . '#i', $this->getVar('path'))) {
 
                         $path = $this->_resource->getCleanPath($this->getVar('path'));
-                    }
-                    else {
+                    } else {
                         $baseDir = Mage::getBaseDir();
                         $path = $this->_resource->getCleanPath($baseDir . DS . trim($this->getVar('path'), DS));
                     }
@@ -66,50 +80,17 @@ public function getResource($forWrite = false)
                     if (!$isError && $realPath === false) {
                         $message = Mage::helper('dataflow')->__('The destination folder "%s" does not exist or there is no access to create it.', $ioConfig['path']);
                         Mage::throwException($message);
-                    }
-                    elseif (!$isError && !is_dir($realPath)) {
+                    } elseif (!$isError && !is_dir($realPath)) {
                         $message = Mage::helper('dataflow')->__('Destination folder "%s" is not a directory.', $realPath);
                         Mage::throwException($message);
-                    }
-                    elseif (!$isError) {
+                    } elseif (!$isError) {
                         if ($forWrite && !is_writeable($realPath)) {
                             $message = Mage::helper('dataflow')->__('Destination folder "%s" is not writable.', $realPath);
                             Mage::throwException($message);
-                        }
-                        else {
+                        } else {
                             $ioConfig['path'] = rtrim($realPath, DS);
                         }
                     }
-
-//                    $baseDir = Mage::getBaseDir();
-//                    $path = $this->_resource->getCleanPath($baseDir . '/' . trim($this->getVar('path'), '/'));
-//                    $basePath = $this->_resource->getCleanPath($baseDir);
-//
-//                    if (strpos($path, $basePath) !== 0) {
-//                        $message = Mage::helper('dataflow')->__('Access denied to destination folder "%s".', $path);
-//                        Mage::throwException($message);
-//                    } else {
-//                        $this->_resource->checkAndCreateFolder($path);
-//                    }
-//
-//                    $realPath = realpath($path);
-//                    if (!$isError && $realPath === false) {
-//                        $message = Mage::helper('dataflow')->__('Destination folder "%s" does not exist or there is no access to create it.', $ioConfig['path']);
-//                        Mage::throwException($message);
-//                    }
-//                    elseif (!$isError && !is_dir($realPath)) {
-//                        $message = Mage::helper('dataflow')->__('Destination folder "%s" is not a directory.', $realPath);
-//                        Mage::throwException($message);
-//                    }
-//                    elseif (!$isError) {
-//                        if ($forWrite && !is_writeable($realPath)) {
-//                            $message = Mage::helper('dataflow')->__('Destination folder "%s" is not writable.', $realPath);
-//                            Mage::throwException($message);
-//                        }
-//                        else {
-//                            $ioConfig['path'] = rtrim($realPath, '/');
-//                        }
-//                    }
                     break;
                 default:
                     $ioConfig['path'] = rtrim($this->getVar('path'), '/');
@@ -158,7 +139,7 @@ public function load()
     }
 
     /**
-     * Save result to destionation file from temporary
+     * Save result to destination file from temporary
      *
      * @return Mage_Dataflow_Model_Convert_Adapter_Io
      */
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php
index fc38b04326..22beab77f9 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php
@@ -45,8 +45,7 @@ public function load()
             exit;
         }
         if (!empty($_FILES['io_file']['tmp_name'])) {
-            //$this->setData(file_get_contents($_FILES['io_file']['tmp_name']));
-            $uploader = new Varien_File_Uploader('io_file');
+            $uploader = new Mage_Core_Model_File_Uploader('io_file');
             $uploader->setAllowedExtensions(array('csv','xml'));
             $path = Mage::app()->getConfig()->getTempVarDir().'/import/';
             $uploader->save($path);
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php
index 4349a8d9af..f9c96b30ec 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php
@@ -303,9 +303,9 @@ protected function _saveParsedRow($xmlString)
         foreach ($xmlElement->Row->children() as $cell) {
             if (is_null($this->_parseFieldNames)) {
                 $xmlData[(string)$cell->Data] = (string)$cell->Data;
-            }
-            else {
-                if (($attributes = $cell->attributes('urn:schemas-microsoft-com:office:spreadsheet')) && isset($attributes['Index'])) {
+            } else {
+                $attributes = $cell->attributes('urn:schemas-microsoft-com:office:spreadsheet');
+                if ($attributes && isset($attributes['Index'])) {
                     $cellIndex = $attributes['Index'] - 1;
                 }
                 $xmlData[$cellIndex] = (string)$cell->Data;
@@ -462,7 +462,7 @@ public function unparse()
      */
     protected function _getXmlString(array $fields = array())
     {
-        $xmlHeader = '<'.'?xml version="1.0"?'.'>' . "\n";
+        $xmlHeader = '<?xml version="1.0"?>' . "\n";
         $xmlRegexp = '/^<cell><row>(.*)?<\/row><\/cell>\s?$/ms';
 
         if (is_null($this->_xmlElement)) {
@@ -476,15 +476,15 @@ protected function _getXmlString(array $fields = array())
             $this->_xmlElement->row = htmlspecialchars($value);
             $value = str_replace($xmlHeader, '', $this->_xmlElement->asXML());
             $value = preg_replace($xmlRegexp, '\\1', $value);
-            $dataType = "String";
             if (is_numeric($value)) {
-                $dataType = "Number";
+                $value = trim($value);
+                $dataType = 'Number';
+            } else {
+                $dataType = 'String';
             }
-            $value = str_replace("\r\n", '&#10;', $value);
-            $value = str_replace("\r", '&#10;', $value);
-            $value = str_replace("\n", '&#10;', $value);
+            $value = str_replace(array("\r\n", "\r", "\n"), '&#10;', $value);
 
-            $xmlData[] = '<Cell><Data ss:Type="'.$dataType.'">'.$value.'</Data></Cell>';
+            $xmlData[] = '<Cell><Data ss:Type="' . $dataType . '">' . $value . '</Data></Cell>';
         }
         $xmlData[] = '</Row>';
 
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php
index 1c9f17f4b6..ccb8aa8bed 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php
@@ -157,16 +157,43 @@ public function importProfileXml($name)
             if ($action->getParam('name')) {
                 $this->addContainer($action->getParam('name'), $container);
             }
-            foreach ($actionNode->var as $varNode) {
+
+            $country = '';
+
+            /** @var $varNode Varien_Simplexml_Element */
+            foreach ($actionNode->var as $key => $varNode) {
                 if ($varNode['name'] == 'map') {
                     $mapData = array();
                     foreach ($varNode->map as $mapNode) {
                         $mapData[(string)$mapNode['name']] = (string)$mapNode;
                     }
                     $container->setVar((string)$varNode['name'], $mapData);
-                }
-                else {
-                    $container->setVar((string)$varNode['name'], (string)$varNode);
+                }  else {
+                    $value = (string)$varNode;
+
+                    /**
+                     * Get state name from directory by iso name
+                     * (only for US)
+                     */
+                    if ($value && 'filter/country' == (string)$varNode['name']) {
+                        /**
+                         * Save country for convert state iso to name (for US only)
+                         */
+                        $country = $value;
+                    } elseif ($value && 'filter/region' == (string)$varNode['name'] && 'US' == $country) {
+                        /**
+                         * Get state name by iso for US
+                         */
+                        /** @var $region Mage_Directory_Model_Region */
+                        $region = Mage::getModel('directory/region');
+
+                        $state = $region->loadByCode($value, $country)->getDefaultName();
+                        if ($state) {
+                            $value = $state;
+                        }
+                    }
+
+                    $container->setVar((string)$varNode['name'], $value);
                 }
             }
         }
diff --git a/app/code/core/Mage/Dataflow/Model/Profile.php b/app/code/core/Mage/Dataflow/Model/Profile.php
index 6bf7a03efc..ace5cc9a0a 100644
--- a/app/code/core/Mage/Dataflow/Model/Profile.php
+++ b/app/code/core/Mage/Dataflow/Model/Profile.php
@@ -56,26 +56,42 @@ protected function _beforeSave()
         parent::_beforeSave();
 
         $actionsXML = $this->getData('actions_xml');
-        if (strlen($actionsXML) < 0 && @simplexml_load_string('<data>'.$actionsXML.'</data>', null, LIBXML_NOERROR) === false) {
+        if (strlen($actionsXML) < 0 &&
+        @simplexml_load_string('<data>' . $actionsXML . '</data>', null, LIBXML_NOERROR) === false) {
             Mage::throwException(Mage::helper("dataflow")->__("Actions XML is not valid."));
         }
 
         if (is_array($this->getGuiData())) {
             $data = $this->getData();
             $guiData = $this->getGuiData();
+            $charSingleList = array('\\', '/', '.', '!', '@', '#', '$', '%', '&', '*', '~', '^');
             if (isset($guiData['file']['type']) && $guiData['file']['type'] == 'file') {
-                if (strlen($guiData['file']['path']) == 0
+                if (empty($guiData['file']['path'])
                 || (strlen($guiData['file']['path']) == 1
-                && in_array($guiData['file']['path'], array('\\','/','.','!','@','#','$','%','&', '*','~', '^')))) {
+                && in_array($guiData['file']['path'], $charSingleList))) {
                     $guiData['file']['path'] = self::DEFAULT_EXPORT_PATH;
                 }
-                if (strlen($guiData['file']['filename']) == 0 ) {
-                    $guiData['file']['filename'] = self::DEFAULT_EXPORT_FILENAME.$data['entity_type'].'.'.($guiData['parse']['type']=='csv'?$guiData['parse']['type']:'xml');
+                if (empty($guiData['file']['filename'])) {
+                    $guiData['file']['filename'] = self::DEFAULT_EXPORT_FILENAME . $data['entity_type']
+                        . '.' . ($guiData['parse']['type']=='csv' ? $guiData['parse']['type'] : 'xml');
                 }
+
+                //validate export available path
+                $path = rtrim($guiData['file']['path'], '\\/')
+                      . DS . $guiData['file']['filename'];
+                /** @var $validator Mage_Core_Model_File_Validator_AvailablePath */
+                $validator = Mage::getModel('core/file_validator_availablePath');
+                /** @var $helperImportExport Mage_ImportExport_Helper_Data */
+                $helperImportExport = Mage::helper('importexport');
+                $validator->setPaths($helperImportExport->getLocalValidPaths());
+                if (!$validator->isValid($path)) {
+                    foreach ($validator->getMessages() as $message) {
+                        Mage::throwException($message);
+                    }
+                }
+
                 $this->setGuiData($guiData);
             }
-//        	echo '<pre>';
-//        	print_r($this->getGuiData());
             $this->_parseGuiData();
 
             $this->setGuiData(serialize($this->getGuiData()));
@@ -97,24 +113,25 @@ protected function _afterSave()
             ->setActionCode($this->getOrigData('profile_id') ? 'update' : 'create')
             ->save();
 
-        if (isset($_FILES['file_1']['tmp_name']) || isset($_FILES['file_2']['tmp_name']) || isset($_FILES['file_3']['tmp_name'])) {
+        if (isset($_FILES['file_1']['tmp_name']) || isset($_FILES['file_2']['tmp_name'])
+        || isset($_FILES['file_3']['tmp_name'])) {
             for ($index = 0; $index < 3; $index++) {
-                if ($file = $_FILES['file_'.($index+1)]['tmp_name']) {
-                    $uploader = new Varien_File_Uploader('file_'.($index+1));
+                if ($file = $_FILES['file_' . ($index+1)]['tmp_name']) {
+                    $uploader = new Mage_Core_Model_File_Uploader('file_' . ($index + 1));
                     $uploader->setAllowedExtensions(array('csv','xml'));
-                    $path = Mage::app()->getConfig()->getTempVarDir().'/import/';
+                    $path = Mage::app()->getConfig()->getTempVarDir() . '/import/';
                     $uploader->save($path);
                     if ($uploadFile = $uploader->getUploadedFileName()) {
-                        $newFilename = 'import-'.date('YmdHis').'-'.($index+1).'_'.$uploadFile;
-                        rename($path.$uploadFile, $path.$newFilename);
+                        $newFilename = 'import-' . date('YmdHis') . '-' . ($index+1) . '_' . $uploadFile;
+                        rename($path . $uploadFile, $path . $newFilename);
                     }
                 }
                 //BOM deleting for UTF files
                 if (isset($newFilename) && $newFilename) {
-                    $contents = file_get_contents($path.$newFilename);
+                    $contents = file_get_contents($path . $newFilename);
                     if (ord($contents[0]) == 0xEF && ord($contents[1]) == 0xBB && ord($contents[2]) == 0xBF) {
                         $contents = substr($contents, 3);
-                        file_put_contents($path.$newFilename, $contents);
+                        file_put_contents($path . $newFilename, $contents);
                     }
                     unset($contents);
                 }
@@ -141,7 +158,8 @@ public function run()
         /**
          * Prepare xml convert profile actions data
          */
-        $xml = '<convert version="1.0"><profile name="default">'.$this->getActionsXml().'</profile></convert>';
+        $xml = '<convert version="1.0"><profile name="default">' . $this->getActionsXml()
+             . '</profile></convert>';
         $profile = Mage::getModel('core/convert')
             ->importXml($xml)
             ->getProfile('default');
@@ -154,10 +172,6 @@ public function run()
                 ->save();
             $this->setBatchId($batch->getId());
 
-//            print '<pre>';
-//            print_r($this->getData());
-//            print '</pre>';
-
             $profile->setDataflowProfile($this->getData());
             $profile->run();
         }
@@ -184,7 +198,8 @@ public function _parseGuiData()
 //            $p['file']['filename'] = $p['interactive']['filename'];
 //            $p['file']['path'] = 'var/export';
 
-            $interactiveXml = '<action type="dataflow/convert_adapter_http" method="'.($import?'load':'save').'">'.$nl;
+            $interactiveXml = '<action type="dataflow/convert_adapter_http" method="'
+                . ($import ? 'load' : 'save') . '">' . $nl;
             #$interactiveXml .= '    <var name="filename"><![CDATA['.$p['interactive']['filename'].']]></var>'.$nl;
             $interactiveXml .= '</action>';
 
@@ -192,47 +207,59 @@ public function _parseGuiData()
         } else {
             $interactiveXml = '';
 
-            $fileXml = '<action type="dataflow/convert_adapter_io" method="'.($import?'load':'save').'">'.$nl;
-            $fileXml .= '    <var name="type">'.$p['file']['type'].'</var>'.$nl;
-            $fileXml .= '    <var name="path">'.$p['file']['path'].'</var>'.$nl;
-            $fileXml .= '    <var name="filename"><![CDATA['.$p['file']['filename'].']]></var>'.$nl;
+            $fileXml = '<action type="dataflow/convert_adapter_io" method="'
+                . ($import ? 'load' : 'save') . '">' . $nl;
+            $fileXml .= '    <var name="type">' . $p['file']['type'] . '</var>' . $nl;
+            $fileXml .= '    <var name="path">' . $p['file']['path'] . '</var>' . $nl;
+            $fileXml .= '    <var name="filename"><![CDATA[' . $p['file']['filename'] . ']]></var>' . $nl;
             if ($p['file']['type']==='ftp') {
                 $hostArr = explode(':', $p['file']['host']);
-                $fileXml .= '    <var name="host"><![CDATA['.$hostArr[0].']]></var>'.$nl;
+                $fileXml .= '    <var name="host"><![CDATA[' . $hostArr[0] . ']]></var>' . $nl;
                 if (isset($hostArr[1])) {
-                    $fileXml .= '    <var name="port"><![CDATA['.$hostArr[1].']]></var>'.$nl;
+                    $fileXml .= '    <var name="port"><![CDATA[' . $hostArr[1] . ']]></var>' . $nl;
                 }
                 if (!empty($p['file']['passive'])) {
-                    $fileXml .= '    <var name="passive">true</var>'.$nl;
+                    $fileXml .= '    <var name="passive">true</var>' . $nl;
+                }
+                if ((!empty($p['file']['file_mode']))
+                        && ($p['file']['file_mode'] == FTP_ASCII || $p['file']['file_mode'] == FTP_BINARY)
+                ) {
+                    $fileXml .= '    <var name="file_mode">' . $p['file']['file_mode'] . '</var>' . $nl;
                 }
                 if (!empty($p['file']['user'])) {
-                    $fileXml .= '    <var name="user"><![CDATA['.$p['file']['user'].']]></var>'.$nl;
+                    $fileXml .= '    <var name="user"><![CDATA[' . $p['file']['user'] . ']]></var>' . $nl;
                 }
                 if (!empty($p['file']['password'])) {
-                    $fileXml .= '    <var name="password"><![CDATA['.$p['file']['password'].']]></var>'.$nl;
+                    $fileXml .= '    <var name="password"><![CDATA[' . $p['file']['password'] . ']]></var>' . $nl;
                 }
             }
             if ($import) {
-                $fileXml .= '    <var name="format"><![CDATA['.$p['parse']['type'].']]></var>'.$nl;
+                $fileXml .= '    <var name="format"><![CDATA[' . $p['parse']['type'] . ']]></var>' . $nl;
             }
-            $fileXml .= '</action>'.$nl.$nl;
+            $fileXml .= '</action>' . $nl . $nl;
         }
 
         switch ($p['parse']['type']) {
             case 'excel_xml':
-                $parseFileXml = '<action type="dataflow/convert_parser_xml_excel" method="'.($import?'parse':'unparse').'">'.$nl;
-                $parseFileXml .= '    <var name="single_sheet"><![CDATA['.($p['parse']['single_sheet']!==''?$p['parse']['single_sheet']:'').']]></var>'.$nl;
+                $parseFileXml = '<action type="dataflow/convert_parser_xml_excel" method="'
+                    . ($import ? 'parse' : 'unparse') . '">' . $nl;
+                $parseFileXml .= '    <var name="single_sheet"><![CDATA['
+                    . ($p['parse']['single_sheet'] !== '' ? $p['parse']['single_sheet'] : '')
+                    . ']]></var>' . $nl;
                 break;
 
             case 'csv':
-                $parseFileXml = '<action type="dataflow/convert_parser_csv" method="'.($import?'parse':'unparse').'">'.$nl;
-                $parseFileXml .= '    <var name="delimiter"><![CDATA['.$p['parse']['delimiter'].']]></var>'.$nl;
-                $parseFileXml .= '    <var name="enclose"><![CDATA['.$p['parse']['enclose'].']]></var>'.$nl;
+                $parseFileXml = '<action type="dataflow/convert_parser_csv" method="'
+                    . ($import ? 'parse' : 'unparse') . '">' . $nl;
+                $parseFileXml .= '    <var name="delimiter"><![CDATA['
+                    . $p['parse']['delimiter'] . ']]></var>' . $nl;
+                $parseFileXml .= '    <var name="enclose"><![CDATA['
+                    . $p['parse']['enclose'] . ']]></var>' . $nl;
                 break;
         }
-        $parseFileXml .= '    <var name="fieldnames">'.$p['parse']['fieldnames'].'</var>'.$nl;
+        $parseFileXml .= '    <var name="fieldnames">' . $p['parse']['fieldnames'] . '</var>' . $nl;
         $parseFileXmlInter = $parseFileXml;
-        $parseFileXml .= '</action>'.$nl.$nl;
+        $parseFileXml .= '</action>' . $nl . $nl;
 
         $mapXml = '';
 
@@ -249,26 +276,26 @@ public function _parseGuiData()
                 }
             }
         }
-        $mapXml .= '<action type="dataflow/convert_mapper_column" method="map">'.$nl;
+        $mapXml .= '<action type="dataflow/convert_mapper_column" method="map">' . $nl;
         $map = $p['map'][$this->getEntityType()];
-        if (sizeof($map['db'])>0) {
+        if (sizeof($map['db']) > 0) {
             $from = $map[$import?'file':'db'];
             $to = $map[$import?'db':'file'];
-            $mapXml .= '    <var name="map">'.$nl;
-            $parseFileXmlInter .= '    <var name="map">'.$nl;
+            $mapXml .= '    <var name="map">' . $nl;
+            $parseFileXmlInter .= '    <var name="map">' . $nl;
             foreach ($from as $i=>$f) {
-                $mapXml .= '        <map name="'.$f.'"><![CDATA['.$to[$i].']]></map>'.$nl;
-                $parseFileXmlInter .= '        <map name="'.$f.'"><![CDATA['.$to[$i].']]></map>'.$nl;
+                $mapXml .= '        <map name="' . $f . '"><![CDATA[' . $to[$i] . ']]></map>' . $nl;
+                $parseFileXmlInter .= '        <map name="' . $f . '"><![CDATA[' . $to[$i] . ']]></map>' . $nl;
             }
-            $mapXml .= '    </var>'.$nl;
-            $parseFileXmlInter .= '    </var>'.$nl;
+            $mapXml .= '    </var>' . $nl;
+            $parseFileXmlInter .= '    </var>' . $nl;
         }
         if ($p['map']['only_specified']) {
-            $mapXml .= '    <var name="_only_specified">'.$p['map']['only_specified'].'</var>'.$nl;
-            //$mapXml .= '    <var name="map">'.$nl;
-            $parseFileXmlInter .= '    <var name="_only_specified">'.$p['map']['only_specified'].'</var>'.$nl;
+            $mapXml .= '    <var name="_only_specified">' . $p['map']['only_specified'] . '</var>' . $nl;
+            //$mapXml .= '    <var name="map">' . $nl;
+            $parseFileXmlInter .= '    <var name="_only_specified">' . $p['map']['only_specified'] . '</var>' . $nl;
         }
-        $mapXml .= '</action>'.$nl.$nl;
+        $mapXml .= '</action>' . $nl . $nl;
 
         $parsers = array(
             'product'=>'catalog/convert_parser_product',
@@ -277,22 +304,23 @@ public function _parseGuiData()
 
         if ($import) {
 //            if ($this->getDataTransfer()==='interactive') {
-                $parseFileXmlInter .= '    <var name="store"><![CDATA['.$this->getStoreId().']]></var>'.$nl;
+                $parseFileXmlInter .= '    <var name="store"><![CDATA[' . $this->getStoreId() . ']]></var>' . $nl;
 //            } else {
-//                $parseDataXml = '<action type="'.$parsers[$this->getEntityType()].'" method="parse">'.$nl;
-//                $parseDataXml = '    <var name="store"><![CDATA['.$this->getStoreId().']]></var>'.$nl;
+//                $parseDataXml = '<action type="' . $parsers[$this->getEntityType()] . '" method="parse">' . $nl;
+//                $parseDataXml = '    <var name="store"><![CDATA[' . $this->getStoreId() . ']]></var>' . $nl;
 //                $parseDataXml .= '</action>'.$nl.$nl;
 //            }
 //            $parseDataXml = '<action type="'.$parsers[$this->getEntityType()].'" method="parse">'.$nl;
 //            $parseDataXml .= '    <var name="store"><![CDATA['.$this->getStoreId().']]></var>'.$nl;
 //            $parseDataXml .= '</action>'.$nl.$nl;
         } else {
-            $parseDataXml = '<action type="'.$parsers[$this->getEntityType()].'" method="unparse">'.$nl;
-            $parseDataXml .= '    <var name="store"><![CDATA['.$this->getStoreId().']]></var>'.$nl;
+            $parseDataXml = '<action type="' . $parsers[$this->getEntityType()] . '" method="unparse">' . $nl;
+            $parseDataXml .= '    <var name="store"><![CDATA[' . $this->getStoreId() . ']]></var>' . $nl;
             if (isset($p['export']['add_url_field'])) {
-                $parseDataXml .= '    <var name="url_field"><![CDATA['.$p['export']['add_url_field'].']]></var>'.$nl;
+                $parseDataXml .= '    <var name="url_field"><![CDATA['
+                    . $p['export']['add_url_field'] . ']]></var>' . $nl;
             }
-            $parseDataXml .= '</action>'.$nl.$nl;
+            $parseDataXml .= '</action>' . $nl . $nl;
         }
 
         $adapters = array(
@@ -301,64 +329,66 @@ public function _parseGuiData()
         );
 
         if ($import) {
-            $entityXml = '<action type="'.$adapters[$this->getEntityType()].'" method="save">'.$nl;
-            $entityXml .= '    <var name="store"><![CDATA['.$this->getStoreId().']]></var>'.$nl;
-            $entityXml .= '</action>'.$nl.$nl;
+            $entityXml = '<action type="' . $adapters[$this->getEntityType()] . '" method="save">' . $nl;
+            $entityXml .= '    <var name="store"><![CDATA[' . $this->getStoreId() . ']]></var>' . $nl;
+            $entityXml .= '</action>' . $nl . $nl;
         } else {
-            $entityXml = '<action type="'.$adapters[$this->getEntityType()].'" method="load">'.$nl;
-            $entityXml .= '    <var name="store"><![CDATA['.$this->getStoreId().']]></var>'.$nl;
+            $entityXml = '<action type="' . $adapters[$this->getEntityType()] . '" method="load">' . $nl;
+            $entityXml .= '    <var name="store"><![CDATA[' . $this->getStoreId() . ']]></var>' . $nl;
             foreach ($p[$this->getEntityType()]['filter'] as $f=>$v) {
 
                 if (empty($v)) {
                     continue;
                 }
                 if (is_scalar($v)) {
-                    $entityXml .= '    <var name="filter/'.$f.'"><![CDATA['.$v.']]></var>'.$nl;
-                    $parseFileXmlInter .= '    <var name="filter/'.$f.'"><![CDATA['.$v.']]></var>'.$nl;
+                    $entityXml .= '    <var name="filter/' . $f . '"><![CDATA[' . $v . ']]></var>' . $nl;
+                    $parseFileXmlInter .= '    <var name="filter/' . $f . '"><![CDATA[' . $v . ']]></var>' . $nl;
                 } elseif (is_array($v)) {
                     foreach ($v as $a=>$b) {
 
                         if (strlen($b) == 0) {
                             continue;
                         }
-                        $entityXml .= '    <var name="filter/'.$f.'/'.$a.'"><![CDATA['.$b.']]></var>'.$nl;
-                        $parseFileXmlInter .= '    <var name="filter/'.$f.'/'.$a.'"><![CDATA['.$b.']]></var>'.$nl;
+                        $entityXml .= '    <var name="filter/' . $f . '/' . $a
+                            . '"><![CDATA[' . $b . ']]></var>' . $nl;
+                        $parseFileXmlInter .= '    <var name="filter/' . $f . '/'
+                            . $a . '"><![CDATA[' . $b . ']]></var>' . $nl;
                     }
                 }
             }
-            $entityXml .= '</action>'.$nl.$nl;
+            $entityXml .= '</action>' . $nl . $nl;
         }
 
         // Need to rewrite the whole xml action format
         if ($import) {
             $numberOfRecords = isset($p['import']['number_of_records']) ? $p['import']['number_of_records'] : 1;
-            $decimalSeparator = isset($p['import']['decimal_separator']) ? $p['import']['decimal_separator'] : '.';
+            $decimalSeparator = isset($p['import']['decimal_separator']) ? $p['import']['decimal_separator'] : ' . ';
             $parseFileXmlInter .= '    <var name="number_of_records">'
                 . $numberOfRecords . '</var>' . $nl;
             $parseFileXmlInter .= '    <var name="decimal_separator"><![CDATA['
                 . $decimalSeparator . ']]></var>' . $nl;
             if ($this->getDataTransfer()==='interactive') {
                 $xml = $parseFileXmlInter;
-                $xml .= '    <var name="adapter">'.$adapters[$this->getEntityType()].'</var>'.$nl;
-                $xml .= '    <var name="method">parse</var>'.$nl;
+                $xml .= '    <var name="adapter">' . $adapters[$this->getEntityType()] . '</var>' . $nl;
+                $xml .= '    <var name="method">parse</var>' . $nl;
                 $xml .= '</action>';
             } else {
                 $xml = $fileXml;
                 $xml .= $parseFileXmlInter;
-                $xml .= '    <var name="adapter">'.$adapters[$this->getEntityType()].'</var>'.$nl;
-                $xml .= '    <var name="method">parse</var>'.$nl;
+                $xml .= '    <var name="adapter">' . $adapters[$this->getEntityType()] . '</var>' . $nl;
+                $xml .= '    <var name="method">parse</var>' . $nl;
                 $xml .= '</action>';
             }
             //$xml = $interactiveXml.$fileXml.$parseFileXml.$mapXml.$parseDataXml.$entityXml;
 
         } else {
-            $xml = $entityXml.$parseDataXml.$mapXml.$parseFileXml.$fileXml.$interactiveXml;
+            $xml = $entityXml . $parseDataXml . $mapXml . $parseFileXml . $fileXml . $interactiveXml;
         }
 
         $this->setGuiData($p);
         $this->setActionsXml($xml);
-/*echo "<pre>".print_r($p,1)."</pre>";
-echo "<xmp>".$xml."</xmp>";
+/*echo "<pre>" . print_r($p,1) . "</pre>";
+echo "<xmp>" . $xml . "</xmp>";
 die;*/
         return $this;
     }
diff --git a/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php b/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php
index 72b1cdce3a..8862e0c8b1 100644
--- a/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php
+++ b/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php
@@ -44,9 +44,9 @@ public function load()
 <?php
              exit;
          }
+
          if (!empty($_FILES['io_file']['tmp_name'])) {
-            //$this->setData(file_get_contents($_FILES['io_file']['tmp_name']));
-            $uploader = new Varien_File_Uploader('io_file');
+            $uploader = new Mage_Core_Model_File_Uploader('io_file');
             $uploader->setAllowedExtensions(array('csv','xml'));
             $path = Mage::app()->getConfig()->getTempVarDir().'/import/';
             $uploader->save($path);
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Region.php b/app/code/core/Mage/Directory/Model/Mysql4/Region.php
index 3e69477d9c..83ce692233 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Region.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Region.php
@@ -60,15 +60,18 @@ public function getIdFieldName()
 
     public function load(Mage_Directory_Model_Region $region, $regionId)
     {
-        $locale = Mage::app()->getLocale()->getLocaleCode();
-        $systemLocale = Mage::app()->getDistroLocaleCode();
+        $locale = $this->_read->quote(Mage::app()->getLocale()->getLocaleCode());
+        $systemLocale = $this->_read->quote(Mage::app()->getDistroLocaleCode());
 
         $select = $this->_read->select()
-            ->from(array('region'=>$this->_regionTable))
+            ->from(array('region' => $this->_regionTable))
             ->where('region.region_id=?', $regionId)
-            ->join(array('rname'=>$this->_regionNameTable),
-                'rname.region_id=region.region_id AND (rname.locale=\''.$locale.'\' OR rname.locale=\''.$systemLocale.'\')',
-                array('name', new Zend_Db_Expr('CASE rname.locale WHEN \''.$systemLocale.'\' THEN 1 ELSE 0 END sort_locale')))
+            ->join(array('rname' => $this->_regionNameTable),
+                'rname.region_id=region.region_id AND (rname.locale= ' . $locale
+                    . ' OR rname.locale=' . $systemLocale . ')',
+                array('name',
+                    new Zend_Db_Expr('CASE rname.locale WHEN ' . $systemLocale
+                        . ' THEN 1 ELSE 0 END sort_locale')))
             ->order('sort_locale')
             ->limit(1);
 
@@ -78,14 +81,14 @@ public function load(Mage_Directory_Model_Region $region, $regionId)
 
     public function loadByCode(Mage_Directory_Model_Region $region, $regionCode, $countryId)
     {
-        $locale = Mage::app()->getLocale()->getLocaleCode();
+        $locale = $this->_read->quote(Mage::app()->getLocale()->getLocaleCode());
 
         $select = $this->_read->select()
             ->from(array('region'=>$this->_regionTable))
             ->where('region.country_id=?', $countryId)
-            ->where('region.code=?', $regionCode)
-            ->join(array('rname'=>$this->_regionNameTable),
-                'rname.region_id=region.region_id AND rname.locale=\''.$locale.'\'',
+            ->where('region.code =?', $regionCode)
+            ->join(array('rname' => $this->_regionNameTable),
+                'rname.region_id=region.region_id AND rname.locale= ' . $locale,
                 array('name'));
 
         $region->setData($this->_read->fetchRow($select));
@@ -94,14 +97,14 @@ public function loadByCode(Mage_Directory_Model_Region $region, $regionCode, $co
 
     public function loadByName(Mage_Directory_Model_Region $region, $regionName, $countryId)
     {
-        $locale = Mage::app()->getLocale()->getLocaleCode();
+        $locale = $this->_read->quote(Mage::app()->getLocale()->getLocaleCode());
 
         $select = $this->_read->select()
             ->from(array('region'=>$this->_regionTable))
             ->where('region.country_id=?', $countryId)
             ->where('region.default_name=?', $regionName)
             ->join(array('rname'=>$this->_regionNameTable),
-                'rname.region_id=region.region_id AND rname.locale=\''.$locale.'\'',
+                'rname.region_id=region.region_id AND rname.locale=' . $locale,
                 array('name'));
 
         $region->setData($this->_read->fetchRow($select));
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php
index 74f32dd4cd..a80a77188c 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php
@@ -29,7 +29,7 @@
  *
  * @category   Mage
  * @package    Mage_Directory
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Mage_Directory_Model_Mysql4_Region_Collection extends Varien_Data_Collection_Db
 {
@@ -45,13 +45,20 @@ public function __construct()
         $this->_regionTable     = Mage::getSingleton('core/resource')->getTableName('directory/country_region');
         $this->_regionNameTable = Mage::getSingleton('core/resource')->getTableName('directory/country_region_name');
 
-        $locale = Mage::app()->getLocale()->getLocaleCode();
+        $locale =  $this->_select->getAdapter()->quote(
+            Mage::app()->getLocale()->getLocaleCode());
+
 
         $this->_select->from(array('region'=>$this->_regionTable),
-            array('region_id'=>'region_id', 'country_id'=>'country_id', 'code'=>'code', 'default_name'=>'default_name')
-        );
+            array(
+                 'region_id'    => 'region_id',
+                 'country_id'   => 'country_id',
+                 'code'         => 'code',
+                 'default_name' => 'default_name'
+            ));
         $this->_select->joinLeft(array('rname'=>$this->_regionNameTable),
-            "region.region_id=rname.region_id AND rname.locale='$locale'", array('name'));
+            'region.region_id = rname.region_id AND rname.locale = ' . $locale,
+            array('name'));
 
         $this->setItemObjectClass(Mage::getConfig()->getModelClassName('directory/region'));
     }
@@ -60,7 +67,7 @@ public function addCountryFilter($countryId)
     {
         if (!empty($countryId)) {
             if (is_array($countryId)) {
-                $this->addFieldToFilter('region.country_id', array('in'=>$countryId));
+                $this->addFieldToFilter('region.country_id', array('in' => $countryId));
             } else {
                 $this->addFieldToFilter('region.country_id', $countryId);
             }
@@ -71,7 +78,7 @@ public function addCountryFilter($countryId)
     public function addCountryCodeFilter($countryCode)
     {
         $this->_select->joinLeft(array('country'=>$this->_countryTable), 'region.country_id=country.country_id');
-        $this->_select->where("country.iso3_code = '{$countryCode}'");
+        $this->_select->where('country.iso3_code = ?', $countryCode);
         return $this;
     }
 
@@ -79,9 +86,9 @@ public function addRegionCodeFilter($regionCode)
     {
         if (!empty($regionCode)) {
             if (is_array($regionCode)) {
-                $this->_select->where("region.code IN ('".implode("','", $regionCode)."')");
+                $this->_select->where('region.code IN(?)', $regionCode);
             } else {
-                $this->_select->where("region.code = '{$regionCode}'");
+                $this->_select->where('region.code = ?', $regionCode);
             }
         }
         return $this;
@@ -91,9 +98,9 @@ public function addRegionNameFilter($regionName)
     {
         if (!empty($regionName)) {
             if (is_array($regionName)) {
-                $this->_select->where("region.default_name in ('".implode("','", $regionName)."')");
+                $this->_select->where('region.default_name IN(?)', $regionName);
             } else {
-                $this->_select->where("region.default_name = '{$regionName}'");
+                $this->_select->where('region.default_name = ?', $regionName);
             }
         }
         return $this;
@@ -109,7 +116,10 @@ public function toOptionArray()
             );
         }
         if (count($options)>0) {
-            array_unshift($options, array('title'=>null, 'value'=>'0', 'label'=>Mage::helper('directory')->__('-- Please select --')));
+            array_unshift($options,
+                array('title' => null,
+                     'value' => '0',
+                     'label' => Mage::helper('directory')->__('-- Please select --')));
         }
         return $options;
     }
diff --git a/app/code/core/Mage/Directory/etc/api.xml b/app/code/core/Mage/Directory/etc/api.xml
index 344ead0708..1b0b54bc56 100644
--- a/app/code/core/Mage/Directory/etc/api.xml
+++ b/app/code/core/Mage/Directory/etc/api.xml
@@ -30,7 +30,7 @@
         <resources>
             <directory_country translate="title" module="directory">
                 <model>directory/country_api</model>
-                <title>Country Api</title>
+                <title>Country API</title>
                 <acl>directory/country</acl>
                 <methods>
                     <list translate="title" module="directory">
@@ -41,7 +41,7 @@
             </directory_country>
             <directory_region translate="title" module="directory">
                 <model>directory/region_api</model>
-                <title>Region Api</title>
+                <title>Region API</title>
                 <acl>directory/region</acl>
                 <methods>
                     <list translate="title" module="directory">
diff --git a/app/code/core/Mage/Directory/etc/wsi.xml b/app/code/core/Mage/Directory/etc/wsi.xml
new file mode 100644
index 0000000000..eca62b5d0c
--- /dev/null
+++ b/app/code/core/Mage/Directory/etc/wsi.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:typens="urn:{{var wsdl.name}}"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+             name="{{var wsdl.name}}"
+             targetNamespace="urn:{{var wsdl.name}}">
+    <wsdl:types>
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:{{var wsdl.name}}">
+            <xsd:complexType name="directoryCountryEntity">
+                <xsd:sequence>
+                    <xsd:element name="country_id" type="xsd:string" />
+                    <xsd:element name="iso2_code" type="xsd:string" />
+                    <xsd:element name="iso3_code" type="xsd:string" />
+                    <xsd:element name="name" type="xsd:string" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="directoryCountryEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:directoryCountryEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="directoryRegionEntity">
+                <xsd:sequence>
+                    <xsd:element name="region_id" type="xsd:string" />
+                    <xsd:element name="code" type="xsd:string" />
+                    <xsd:element name="name" type="xsd:string" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="directoryRegionEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:directoryRegionEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+
+
+            <xsd:element name="directoryCountryListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="directoryCountryListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:directoryCountryEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="directoryRegionListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="country" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="directoryRegionListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:directoryRegionEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="directoryCountryListRequest">
+        <wsdl:part name="parameters" element="typens:directoryCountryListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="directoryCountryListResponse">
+        <wsdl:part name="parameters" element="typens:directoryCountryListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="directoryRegionListRequest">
+        <wsdl:part name="parameters" element="typens:directoryRegionListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="directoryRegionListResponse">
+        <wsdl:part name="parameters" element="typens:directoryRegionListResponseParam" />
+    </wsdl:message>
+    <wsdl:portType name="{{var wsdl.handler}}PortType">
+        <wsdl:operation name="directoryCountryList">
+            <wsdl:documentation>List of countries</wsdl:documentation>
+            <wsdl:input message="typens:directoryCountryListRequest" />
+            <wsdl:output message="typens:directoryCountryListResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="directoryRegionList">
+            <wsdl:documentation>List of regions in specified country</wsdl:documentation>
+            <wsdl:input message="typens:directoryRegionListRequest" />
+            <wsdl:output message="typens:directoryRegionListResponse" />
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="{{var wsdl.handler}}Binding" type="typens:{{var wsdl.handler}}PortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="directoryCountryList">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="directoryRegionList">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="{{var wsdl.name}}Service">
+        <wsdl:port name="{{var wsdl.handler}}Port" binding="typens:{{var wsdl.handler}}Binding">
+            <soap:address location="{{var wsdl.url}}" />
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
diff --git a/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php b/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php
index a0282e9771..69cacabec2 100644
--- a/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php
+++ b/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php
@@ -51,7 +51,14 @@ public function __construct()
         }
         $purchasedItems = Mage::getResourceModel('downloadable/link_purchased_item_collection')
             ->addFieldToFilter('purchased_id', array('in' => $purchasedIds))
-            ->addFieldToFilter('status', array('nin' => Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_PENDING_PAYMENT))
+            ->addFieldToFilter('status',
+                array(
+                    'nin' => array(
+                        Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_PENDING_PAYMENT,
+                        Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_PAYMENT_REVIEW
+                    )
+                )
+            )
             ->setOrder('item_id', 'desc');
         $this->setItems($purchasedItems);
     }
diff --git a/app/code/core/Mage/Downloadable/Helper/Download.php b/app/code/core/Mage/Downloadable/Helper/Download.php
index 6ba7756c8e..77c1ecd344 100644
--- a/app/code/core/Mage/Downloadable/Helper/Download.php
+++ b/app/code/core/Mage/Downloadable/Helper/Download.php
@@ -246,6 +246,13 @@ public function getFilename()
      */
     public function setResource($resourceFile, $linkType = self::LINK_TYPE_FILE)
     {
+        if (self::LINK_TYPE_FILE == $linkType) {
+            //check LFI protection
+            /** @var $helper Mage_Core_Helper_Data */
+            $helper = Mage::helper('core');
+            $helper->checkLfiProtection($resourceFile);
+        }
+
         $this->_resourceFile    = $resourceFile;
         $this->_linkType        = $linkType;
 
diff --git a/app/code/core/Mage/Downloadable/Helper/File.php b/app/code/core/Mage/Downloadable/Helper/File.php
index 14edd45660..1dbcdd968d 100644
--- a/app/code/core/Mage/Downloadable/Helper/File.php
+++ b/app/code/core/Mage/Downloadable/Helper/File.php
@@ -94,7 +94,7 @@ protected function _moveFileFromTmp($baseTmpPath, $basePath, $file)
         }
 
         $destFile = dirname($file) . $ioObject->dirsep()
-                  . Varien_File_Uploader::getNewFileName($this->getFilePath($basePath, $file));
+                  . Mage_Core_Model_File_Uploader::getNewFileName($this->getFilePath($basePath, $file));
 
         Mage::helper('core/file_storage_database')->copyFile(
             $this->getFilePath($baseTmpPath, $file),
diff --git a/app/code/core/Mage/Downloadable/Model/Link/Purchased.php b/app/code/core/Mage/Downloadable/Model/Link/Purchased.php
index 8cd043ffbf..c37d89d683 100644
--- a/app/code/core/Mage/Downloadable/Model/Link/Purchased.php
+++ b/app/code/core/Mage/Downloadable/Model/Link/Purchased.php
@@ -43,4 +43,18 @@ protected function _construct()
         parent::_construct();
     }
 
+    /**
+     * Check order id
+     *
+     * @return Mage_Core_Model_Abstract
+     */
+    public function _beforeSave()
+    {
+        if (null == $this->getOrderId()) {
+            throw new Exception(
+                Mage::helper('downloadable')->__('Order id cannot be null'));
+        }
+        return parent::_beforeSave();
+    }
+
 }
diff --git a/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php b/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php
index 93e9b2f25e..79325273db 100644
--- a/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php
+++ b/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php
@@ -39,6 +39,7 @@ class Mage_Downloadable_Model_Link_Purchased_Item extends Mage_Core_Model_Abstra
     const LINK_STATUS_AVAILABLE = 'available';
     const LINK_STATUS_EXPIRED   = 'expired';
     const LINK_STATUS_PENDING_PAYMENT = 'pending_payment';
+    const LINK_STATUS_PAYMENT_REVIEW = 'payment_review';
 
     /**
      * Enter description here...
@@ -50,4 +51,18 @@ protected function _construct()
         parent::_construct();
     }
 
+    /**
+     * Check order item id
+     *
+     * @return Mage_Core_Model_Abstract
+     */
+    public function _beforeSave()
+    {
+        if (null == $this->getOrderItemId()) {
+            throw new Exception(
+                Mage::helper('downloadable')->__('Order item id cannot be null'));
+        }
+        return parent::_beforeSave();
+    }
+
 }
diff --git a/app/code/core/Mage/Downloadable/Model/Observer.php b/app/code/core/Mage/Downloadable/Model/Observer.php
index 7f4f873382..ec3501cf16 100644
--- a/app/code/core/Mage/Downloadable/Model/Observer.php
+++ b/app/code/core/Mage/Downloadable/Model/Observer.php
@@ -62,6 +62,10 @@ public function prepareProductSave($observer)
     public function saveDownloadableOrderItem($observer)
     {
         $orderItem = $observer->getEvent()->getItem();
+        if (!$orderItem->getId()) {
+            //order not saved in the database
+            return $this;
+        }
         $product = $orderItem->getProduct();
         if ($product && $product->getTypeId() != Mage_Downloadable_Model_Product_Type::TYPE_DOWNLOADABLE) {
             return $this;
@@ -108,7 +112,8 @@ public function saveDownloadableOrderItem($observer)
                             $links[$linkId],
                             $linkPurchasedItem
                         );
-                        $linkHash = strtr(base64_encode(microtime() . $linkPurchased->getId() . $orderItem->getId() . $product->getId()), '+/=', '-_,');
+                        $linkHash = strtr(base64_encode(microtime() . $linkPurchased->getId() . $orderItem->getId()
+                            . $product->getId()), '+/=', '-_,');
                         $numberOfDownloads = $links[$linkId]->getNumberOfDownloads()*$orderItem->getQtyOrdered();
                         $linkPurchasedItem->setLinkHash($linkHash)
                             ->setNumberOfDownloadsBought($numberOfDownloads)
@@ -158,17 +163,27 @@ public function setHasDownloadableProducts($observer)
     public function setLinkStatus($observer)
     {
         $order = $observer->getEvent()->getOrder();
+
+        if (!$order->getId()) {
+            //order not saved in the database
+            return $this;
+        }
+
         /* @var $order Mage_Sales_Model_Order */
         $status = '';
         $orderItemsIds = array();
-        $orderItemStatusToEnable = Mage::getStoreConfig(Mage_Downloadable_Model_Link_Purchased_Item::XML_PATH_ORDER_ITEM_STATUS, $order->getStoreId());
+        $orderItemStatusToEnable = Mage::getStoreConfig(
+            Mage_Downloadable_Model_Link_Purchased_Item::XML_PATH_ORDER_ITEM_STATUS, $order->getStoreId()
+        );
+
         if ($order->getState() == Mage_Sales_Model_Order::STATE_HOLDED) {
             $status = Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_PENDING;
-        } elseif ($order->isCanceled()
-        || $order->getState() == Mage_Sales_Model_Order::STATE_CLOSED) {
+        } elseif ($order->isCanceled() || $order->getState() == Mage_Sales_Model_Order::STATE_CLOSED) {
             $status = Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_EXPIRED;
         } elseif ($order->getState() == Mage_Sales_Model_Order::STATE_PENDING_PAYMENT) {
             $status = Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_PENDING_PAYMENT;
+        } elseif ($order->getState() == Mage_Sales_Model_Order::STATE_PAYMENT_REVIEW) {
+            $status = Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_PAYMENT_REVIEW;
         } else {
             $availableStatuses = array($orderItemStatusToEnable, Mage_Sales_Model_Order_Item::STATUS_INVOICED);
             foreach ($order->getAllItems() as $item) {
diff --git a/app/code/core/Mage/Downloadable/Model/Product/Type.php b/app/code/core/Mage/Downloadable/Model/Product/Type.php
index 274d9f8f0e..b428e614a5 100644
--- a/app/code/core/Mage/Downloadable/Model/Product/Type.php
+++ b/app/code/core/Mage/Downloadable/Model/Product/Type.php
@@ -338,9 +338,18 @@ public function checkProductBuyState($product = null)
         if ($option instanceof Mage_Sales_Model_Quote_Item_Option) {
             $buyRequest = new Varien_Object(unserialize($option->getValue()));
             if (!$buyRequest->hasLinks()) {
-                Mage::throwException(
-                    Mage::helper('downloadable')->__('Please specify product link(s).')
-                );
+                if (!$product->getLinksPurchasedSeparately()) {
+                    $allLinksIds = Mage::getModel('downloadable/link')
+                        ->getCollection()
+                        ->addProductToFilter($product->getId())
+                        ->getAllIds();
+                    $buyRequest->setLinks($allLinksIds);
+                    $product->addCustomOption('info_buyRequest', serialize($buyRequest->getData()));
+                } else {
+                    Mage::throwException(
+                        Mage::helper('downloadable')->__('Please specify product link(s).')
+                    );
+                }
             }
         }
         return $this;
diff --git a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php
index 3b3b969bb5..ccd7823aa5 100644
--- a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php
+++ b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php
@@ -50,7 +50,7 @@ public function uploadAction()
         }
         $result = array();
         try {
-            $uploader = new Varien_File_Uploader($type);
+            $uploader = new Mage_Core_Model_File_Uploader($type);
             $uploader->setAllowRenameFiles(true);
             $uploader->setFilesDispersion(true);
             $result = $uploader->save($tmpPath);
diff --git a/app/code/core/Mage/Downloadable/controllers/DownloadController.php b/app/code/core/Mage/Downloadable/controllers/DownloadController.php
index cbb040fc21..8e63272d39 100644
--- a/app/code/core/Mage/Downloadable/controllers/DownloadController.php
+++ b/app/code/core/Mage/Downloadable/controllers/DownloadController.php
@@ -173,7 +173,9 @@ public function linkAction()
                 }
                 $this->_getCustomerSession()->addNotice($notice);
                 $this->_getCustomerSession()->authenticate($this);
-                $this->_getCustomerSession()->setBeforeAuthUrl(Mage::getUrl('downloadable/customer/products/'), array('_secure' => true));
+                $this->_getCustomerSession()->setBeforeAuthUrl(Mage::getUrl('downloadable/customer/products/'),
+                    array('_secure' => true)
+                );
                 return ;
             }
             $linkPurchased = Mage::getModel('downloadable/link_purchased')->load($linkPurchasedItem->getPurchasedId());
@@ -182,9 +184,13 @@ public function linkAction()
                 return $this->_redirect('*/customer/products');
             }
         }
-        $downloadsLeft = $linkPurchasedItem->getNumberOfDownloadsBought() - $linkPurchasedItem->getNumberOfDownloadsUsed();
-        if ($linkPurchasedItem->getStatus() == Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_AVAILABLE
-            && ($downloadsLeft || $linkPurchasedItem->getNumberOfDownloadsBought() == 0)) {
+        $downloadsLeft = $linkPurchasedItem->getNumberOfDownloadsBought()
+            - $linkPurchasedItem->getNumberOfDownloadsUsed();
+
+        $status = $linkPurchasedItem->getStatus();
+        if ($status == Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_AVAILABLE
+            && ($downloadsLeft || $linkPurchasedItem->getNumberOfDownloadsBought() == 0)
+        ) {
             $resource = '';
             $resourceType = '';
             if ($linkPurchasedItem->getLinkType() == Mage_Downloadable_Helper_Download::LINK_TYPE_URL) {
@@ -198,11 +204,9 @@ public function linkAction()
             }
             try {
                 $this->_processDownload($resource, $resourceType);
-                $linkPurchasedItem->setNumberOfDownloadsUsed(
-                    $linkPurchasedItem->getNumberOfDownloadsUsed()+1
-                );
-                if ($linkPurchasedItem->getNumberOfDownloadsBought() != 0
-                    && !($linkPurchasedItem->getNumberOfDownloadsBought() - $linkPurchasedItem->getNumberOfDownloadsUsed())) {
+                $linkPurchasedItem->setNumberOfDownloadsUsed($linkPurchasedItem->getNumberOfDownloadsUsed() + 1);
+
+                if ($linkPurchasedItem->getNumberOfDownloadsBought() != 0 && !($downloadsLeft - 1)) {
                     $linkPurchasedItem->setStatus(Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_EXPIRED);
                 }
                 $linkPurchasedItem->save();
@@ -213,9 +217,11 @@ public function linkAction()
                     Mage::helper('downloadable')->__('An error occurred while getting the requested content. Please contact the store owner.')
                 );
             }
-        } elseif ($linkPurchasedItem->getStatus() == Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_EXPIRED) {
+        } elseif ($status == Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_EXPIRED) {
             $this->_getCustomerSession()->addNotice(Mage::helper('downloadable')->__('The link has expired.'));
-        } elseif ($linkPurchasedItem->getStatus() == Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_PENDING) {
+        } elseif ($status == Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_PENDING
+            || $status == Mage_Downloadable_Model_Link_Purchased_Item::LINK_STATUS_PAYMENT_REVIEW
+        ) {
             $this->_getCustomerSession()->addNotice(Mage::helper('downloadable')->__('The link is not available.'));
         } else {
             $this->_getCustomerSession()->addError(
diff --git a/app/code/core/Mage/Downloadable/etc/config.xml b/app/code/core/Mage/Downloadable/etc/config.xml
index ae685e885a..3df5655453 100644
--- a/app/code/core/Mage/Downloadable/etc/config.xml
+++ b/app/code/core/Mage/Downloadable/etc/config.xml
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Mage_Downloadable>
-            <version>1.4.0.2</version>
+            <version>1.4.0.3</version>
         </Mage_Downloadable>
     </modules>
     <global>
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php
new file mode 100644
index 0000000000..f76216cb5e
--- /dev/null
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Downloadable
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/** @var $installer Mage_Catalog_Model_Resource_Eav_Mysql4_Setup */
+$installer = $this;
+$adapter = $installer->getConnection();
+
+$adapter->modifyColumn(
+    $installer->getTable('downloadable/link_purchased'),
+    'order_id',
+    "INT(10) UNSIGNED NULL DEFAULT '0'"
+);
+
+$adapter->modifyColumn(
+    $installer->getTable('downloadable/link_purchased_item'),
+    'order_item_id',
+    "INT(10) UNSIGNED NULL DEFAULT '0'"
+);
+
+/**
+ * Update order_id/order_item_id to NULL which contained invalid values
+ */
+$adapter->beginTransaction();
+//update downloadable purchased data
+$select = $adapter->select()
+    ->from(array('d' => $installer->getTable('downloadable/link_purchased')), array('purchased_id', 'purchased_id'))
+    ->joinLeft(array('o' => $installer->getTable('sales/order')),
+        'd.order_id = o.entity_id', array())
+    ->where('o.entity_id IS NULL')
+    ->where('d.order_id IS NOT NULL')
+;
+$ids = $adapter->fetchPairs($select);
+if ($ids) {
+    $adapter->update($installer->getTable('downloadable/link_purchased'),
+        array('order_id' => new Zend_Db_Expr('(NULL)')),
+        $adapter->quoteInto('purchased_id IN (?)', $ids)
+    );
+}
+//update downloadable purchased items data
+$select = $adapter->select()
+    ->from(array('d' => $installer->getTable('downloadable/link_purchased_item')), array('item_id', 'item_id'))
+    ->joinLeft(array('o' => $installer->getTable('sales/order_item')),
+        'd.order_item_id = o.item_id', array())
+    ->where('o.item_id IS NULL')
+    ->where('d.order_item_id IS NOT NULL')
+;
+$ids = $adapter->fetchPairs($select);
+if ($ids) {
+    $adapter->update($installer->getTable('downloadable/link_purchased_item'),
+        array('order_item_id' => new Zend_Db_Expr('(NULL)')),
+        $adapter->quoteInto('item_id IN (?)', $ids)
+    );
+}
+$adapter->commit();
+
+//add foreign keys
+$adapter->addConstraint(
+    'FK_DOWNLOADABLE_LINK_ORDER_ID',
+    $installer->getTable('downloadable/link_purchased'),
+    'order_id',
+    $installer->getTable('sales/order'),
+    'entity_id',
+    'set null'
+);
+$adapter->addConstraint(
+    'FK_DOWNLOADABLE_LINK_ORDER_ITEM_ID',
+    $installer->getTable('downloadable/link_purchased_item'),
+    'order_item_id',
+    $installer->getTable('sales/order_item'),
+    'item_id',
+    'set null'
+);
+
+
+
diff --git a/app/code/core/Mage/Eav/Helper/Data.php b/app/code/core/Mage/Eav/Helper/Data.php
index 4d777a32cf..27a0a6ac9c 100644
--- a/app/code/core/Mage/Eav/Helper/Data.php
+++ b/app/code/core/Mage/Eav/Helper/Data.php
@@ -29,6 +29,11 @@
  */
 class Mage_Eav_Helper_Data extends Mage_Core_Helper_Abstract
 {
+    /**
+     * XML path to input types validator data in config
+     */
+    const XML_PATH_VALIDATOR_DATA_INPUT_TYPES = 'general/validator_data/input_types';
+
     protected $_attributesLockedFields = array();
 
     protected $_entityTypeFrontendClasses = array();
@@ -118,14 +123,24 @@ public function getAttributeLockedFields($entityTypeCode)
         if (isset($this->_attributesLockedFields[$entityTypeCode])) {
             return $this->_attributesLockedFields[$entityTypeCode];
         }
-        $lockedAttributeFields = array();
         $_data = Mage::app()->getConfig()->getNode('global/eav_attributes/' . $entityTypeCode);
         if ($_data) {
             foreach ($_data->children() as $attribute) {
-                $this->_attributesLockedFields[$entityTypeCode][(string)$attribute->code] = array_keys($attribute->locked_fields->asArray());
+                $this->_attributesLockedFields[$entityTypeCode][(string)$attribute->code] =
+                    array_keys($attribute->locked_fields->asArray());
             }
             return $this->_attributesLockedFields[$entityTypeCode];
         }
         return array();
     }
+
+    /**
+     * Get input types validator data
+     *
+     * @return array
+     */
+    public function getInputTypesValidatorData()
+    {
+        return Mage::getStoreConfig(self::XML_PATH_VALIDATOR_DATA_INPUT_TYPES);
+    }
 }
diff --git a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php
new file mode 100644
index 0000000000..e5fdd02c37
--- /dev/null
+++ b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Eav
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Validator for check input type value
+ *
+ * @category   Mage
+ * @package    Mage_Eav
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Eav_Model_Adminhtml_System_Config_Source_Inputtype_Validator extends Zend_Validate_InArray
+{
+
+    /**
+     * Construct
+     */
+    public function __construct()
+    {
+        //set data haystack
+        /** @var $helper Mage_Eav_Helper_Data */
+        $helper = Mage::helper('eav');
+        $haystack = $helper->getInputTypesValidatorData();
+
+        //reset message template and set custom
+        $this->_messageTemplates = null;
+        $this->_initMessageTemplates();
+
+        //parent construct with options
+        parent::__construct(array(
+             'haystack' => $haystack,
+             'strict'   => true,
+        ));
+    }
+
+    /**
+     * Initialize message templates with translating
+     *
+     * @return Mage_Adminhtml_Model_Core_File_Validator_SavePath_Available
+     */
+    protected function _initMessageTemplates()
+    {
+        if (!$this->_messageTemplates) {
+            $this->_messageTemplates = array(
+                self::NOT_IN_ARRAY =>
+                    Mage::helper('core')->__('Input type "%value%" not found in the input types list.'),
+            );
+        }
+        return $this;
+    }
+
+    /**
+     * Add input type to haystack
+     *
+     * @param string $type
+     * @return Mage_Eav_Model_Adminhtml_System_Config_Source_Inputtype_Validator
+     */
+    public function addInputType($type)
+    {
+        if (!in_array((string) $type, $this->_haystack, true)) {
+            $this->_haystack[] = (string) $type;
+        }
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
index c56a84f46f..85d88071cf 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
@@ -382,10 +382,12 @@ public function addAttributeToSelect($attribute, $joinType=false)
                 $attrInstance = $this->_joinAttributes[$attribute]['attribute'];
             } else {
                 //$attrInstance = $this->getEntity()->getAttribute($attribute);
-                $attrInstance = Mage::getSingleton('eav/config')->getCollectionAttribute($this->getEntity()->getType(), $attribute);
+                $attrInstance = Mage::getSingleton('eav/config')
+                    ->getCollectionAttribute($this->getEntity()->getType(), $attribute);
             }
             if (empty($attrInstance)) {
-                throw Mage::exception('Mage_Eav', Mage::helper('eav')->__('Invalid attribute requested: %s', (string)$attribute));
+                throw Mage::exception('Mage_Eav',
+                    Mage::helper('eav')->__('Invalid attribute requested: %s', (string)$attribute));
             }
             $this->_selectAttributes[$attrInstance->getAttributeCode()] = $attrInstance->getId();
         }
@@ -431,7 +433,8 @@ public function addExpressionAttributeToSelect($alias, $expression, $attribute)
     {
         // validate alias
         if (isset($this->_joinFields[$alias])) {
-            throw Mage::exception('Mage_Eav', Mage::helper('eav')->__('Joint field or attribute expression with this alias is already declared.'));
+            throw Mage::exception('Mage_Eav',
+                Mage::helper('eav')->__('Joint field or attribute expression with this alias is already declared.'));
         }
         if(!is_array($attribute)) {
             $attribute = array($attribute);
@@ -535,7 +538,8 @@ public function joinAttribute($alias, $attribute, $bind, $filter=null, $joinType
     {
         // validate alias
         if (isset($this->_joinAttributes[$alias])) {
-            throw Mage::exception('Mage_Eav', Mage::helper('eav')->__('Invalid alias, already exists in joint attributes.'));
+            throw Mage::exception('Mage_Eav',
+                Mage::helper('eav')->__('Invalid alias, already exists in joint attributes.'));
         }
 
         // validate bind attribute
@@ -606,7 +610,8 @@ public function joinAttribute($alias, $attribute, $bind, $filter=null, $joinType
      * Join regular table field and use an attribute as fk
      *
      * Examples:
-     * ('country_name', 'directory/country_name', 'name', 'country_id=shipping_country', "{{table}}.language_code='en'", 'left')
+     * ('country_name', 'directory/country_name', 'name', 'country_id=shipping_country',
+     *      "{{table}}.language_code='en'", 'left')
      *
      * @param string $alias 'country_name'
      * @param string $table 'directory/country_name'
@@ -620,7 +625,8 @@ public function joinField($alias, $table, $field, $bind, $cond=null, $joinType='
     {
         // validate alias
         if (isset($this->_joinFields[$alias])) {
-            throw Mage::exception('Mage_Eav', Mage::helper('eav')->__('Joined field with this alias is already declared.'));
+            throw Mage::exception('Mage_Eav',
+                Mage::helper('eav')->__('Joined field with this alias is already declared.'));
         }
 
         // validate table
@@ -631,7 +637,8 @@ public function joinField($alias, $table, $field, $bind, $cond=null, $joinType='
 
         // validate bind
         list($pk, $fk) = explode('=', $bind);
-        $bindCond = $tableAlias.'.'.$pk.'='.$this->_getAttributeFieldName($fk);
+        $pk = $this->getSelect()->getAdapter()->quoteColumnAs(trim($pk), null);
+        $bindCond = $tableAlias . '.' . $pk . '=' . $this->_getAttributeFieldName($fk);
 
         // process join type
         switch ($joinType) {
@@ -654,15 +661,15 @@ public function joinField($alias, $table, $field, $bind, $cond=null, $joinType='
                 $condArr[] = str_replace('{{table}}', $tableAlias, $cond);
             }
         }
-        $cond = '('.join(') AND (', $condArr).')';
+        $cond = '(' . join(') AND (', $condArr) . ')';
 
         // join table
         $this->getSelect()->$joinMethod(array($tableAlias=>$table), $cond, ($field ? array($alias=>$field) : array()));
 
         // save joined attribute
         $this->_joinFields[$alias] = array(
-            'table'=>$tableAlias,
-            'field'=>$field,
+            'table' => $tableAlias,
+            'field' => $field,
         );
 
         return $this;
@@ -702,7 +709,8 @@ public function joinTable($table, $bind, $fields=null, $cond=null, $joinType='in
         }
         foreach ($fields as $alias=>$field) {
             if (isset($this->_joinFields[$alias])) {
-                throw Mage::exception('Mage_Eav', Mage::helper('eav')->__('A joint field with this alias (%s) is already declared.', $alias));
+                throw Mage::exception('Mage_Eav',
+                    Mage::helper('eav')->__('A joint field with this alias (%s) is already declared.', $alias));
             }
             $this->_joinFields[$alias] = array(
                 'table' => $tableAlias,
@@ -1124,6 +1132,8 @@ protected function _addAttributeJoin($attributeCode, $joinType='inner')
             return $this;
         }
 
+        $adapter = $this->getConnection();
+
         $attrTable = $this->_getAttributeTableAlias($attributeCode);
         if (isset($this->_joinAttributes[$attributeCode])) {
             $attribute      = $this->_joinAttributes[$attributeCode]['attribute'];
@@ -1162,9 +1172,13 @@ protected function _addAttributeJoin($attributeCode, $joinType='inner')
             $attrFieldName = "$attrTable.value";
         }
 
+        $fk = $adapter->quoteColumnAs($fk, null);
+        $pk = $adapter->quoteColumnAs($pk, null);
+
         $condArr = array("$pk = $fk");
         if (!$attribute->getBackend()->isStatic()) {
-            $condArr[] = $this->getConnection()->quoteInto("$attrTable.attribute_id=?", $attribute->getId());
+            $condArr[] = $this->getConnection()->quoteInto(
+                $adapter->quoteColumnAs("$attrTable.attribute_id", null) . ' = ?', $attribute->getId());
         }
 
         /**
diff --git a/app/code/core/Mage/Eav/etc/config.xml b/app/code/core/Mage/Eav/etc/config.xml
index 127c0f3e97..9b85b61a95 100644
--- a/app/code/core/Mage/Eav/etc/config.xml
+++ b/app/code/core/Mage/Eav/etc/config.xml
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Mage_Eav>
-            <version>0.7.15</version>
+            <version>0.7.16</version>
         </Mage_Eav>
     </modules>
     <global>
@@ -81,7 +81,7 @@
         <eav_frontendclasses>
         </eav_frontendclasses>
         <eav_attributes>
-            <!-- 
+            <!--
                 <entity_type>
                     <unique_node_name>
                         <code>attribute_code</code>
@@ -118,4 +118,18 @@
             </modules>
         </translate>
     </frontend>
+    <default>
+        <general>
+            <validator_data>
+                <input_types>
+                    <text>text</text>
+                    <textarea>textarea</textarea>
+                    <date>date</date>
+                    <boolean>boolean</boolean>
+                    <multiselect>multiselect</multiselect>
+                    <select>select</select>
+                </input_types>
+            </validator_data>
+        </general>
+    </default>
 </config>
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.15-0.7.16.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.15-0.7.16.php
new file mode 100644
index 0000000000..49e4cd1160
--- /dev/null
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.15-0.7.16.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Eav
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+
+/* @var $installer Mage_Eav_Model_Entity_Setup */
+$installer = $this;
+
+$installer->startSetup();
+$conn = $installer->getConnection();
+foreach (array('datetime', 'decimal', 'int', 'text', 'varchar') as $type) {
+    $tableName = $installer->getTable('eav_entity_' . $type);
+    $conn->addKey($tableName, 'UNQ_ATTRIBUTE_VALUE', array('entity_id','attribute_id','store_id'), 'unique');
+}
+
+$installer->endSetup();
diff --git a/app/code/core/Mage/GiftMessage/Model/Api.php b/app/code/core/Mage/GiftMessage/Model/Api.php
new file mode 100644
index 0000000000..bf44cb17a1
--- /dev/null
+++ b/app/code/core/Mage/GiftMessage/Model/Api.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_GiftMessage
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * GiftMessage api
+ *
+ * @category   Mage
+ * @package    Mage_GiftMessage
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_GiftMessage_Model_Api extends Mage_Checkout_Model_Api_Resource_Product
+{
+    /**
+     * Return an Array of attributes.
+     *
+     * @param Array $obj
+     * @return Array
+     */
+    protected function _prepareData($arr)
+    {
+        if (is_array($arr)) {
+            return $arr;
+        }
+        return array();
+    }
+
+    /**
+     * Raise event for setting a giftMessage.
+     *
+     * @param String $entityId
+     * @param Mage_Core_Controller_Request_Http $request
+     * @param Mage_Sales_Model_Quote $quote
+     * @return AssociativeArray
+     */
+    protected function _setGiftMessage($entityId, $request, $quote)
+    {
+
+        /**
+         * Below code will catch exceptions only in DeveloperMode
+         * @see Mage_Core_Model_App::_callObserverMethod($object, $method, $observer)
+         * And result of Mage::dispatchEvent will always return an Object of Mage_Core_Model_App.
+         */
+        try {
+            Mage::dispatchEvent(
+                'checkout_controller_onepage_save_shipping_method',
+                array('request' => $request, 'quote' => $quote)
+            );
+            return array('entityId' => $entityId, 'result' => true, 'error' => '');
+        } catch (Exception $e) {
+            return array('entityId' => $entityId, 'result' => false, 'error' => $e->getMessage());
+        }
+    }
+
+    /**
+     * Set GiftMessage for a Quote.
+     *
+     * @param String $quoteId
+     * @param AssociativeArray $giftMessage
+     * @param String $store
+     * @return AssociativeArray
+     */
+    public function setForQuote($quoteId, $giftMessage, $store = null)
+    {
+        /** @var $quote Mage_Sales_Model_Quote */
+        $quote = $this->_getQuote($quoteId, $store);
+
+        $giftMessage = $this->_prepareData($giftMessage);
+        if (empty($giftMessage)) {
+            $this->_fault('giftmessage_invalid_data');
+        }
+
+        $giftMessage['type'] = 'quote';
+        $giftMessages = array($quoteId => $giftMessage);
+        $request = new Mage_Core_Controller_Request_Http();
+        $request->setParam("giftmessage", $giftMessages);
+
+        return $this->_setGiftMessage($quote->getId(), $request, $quote);
+    }
+
+    /**
+     * Set a GiftMessage to QuoteItem by product
+     *
+     * @param String $quoteId
+     * @param Array $productsAndMessages
+     * @param String $store
+     * @return array
+     */
+    public function setForQuoteProduct($quoteId, $productsAndMessages, $store = null)
+    {
+        /** @var $quote Mage_Sales_Model_Quote */
+        $quote = $this->_getQuote($quoteId, $store);
+
+        $productsAndMessages = $this->_prepareData($productsAndMessages);
+        if (empty($productsAndMessages)) {
+            $this->_fault('invalid_data');
+        }
+
+        if (count($productsAndMessages) == 2
+                && isset($productsAndMessages['product'])
+                && isset($productsAndMessages['message'])) {
+            $productsAndMessages = array($productsAndMessages);
+        }
+
+        $results = array();
+        foreach ($productsAndMessages as $productAndMessage) {
+            if (isset($productAndMessage['product']) && isset($productAndMessage['message'])) {
+                $product = $this->_prepareData($productAndMessage['product']);
+                if (empty($product)) {
+                    $this->_fault('product_invalid_data');
+                }
+                $message = $this->_prepareData($productAndMessage['message']);
+                if (empty($message)) {
+                    $this->_fault('giftmessage_invalid_data');
+                }
+
+                if (isset($product['product_id'])) {
+                    $productByItem = $this->_getProduct($product['product_id'], $store, "id");
+                } elseif (isset($product['sku'])) {
+                    $productByItem = $this->_getProduct($product['sku'], $store, "sku");
+                } else {
+                    continue;
+                }
+
+                $productObj = $this->_getProductRequest($product);
+                $quoteItem = $this->_getQuoteItemByProduct($quote, $productByItem, $productObj);
+                $results[] = $this->setForQuoteItem($quoteItem->getId(), $message, $store);
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * Set GiftMessage for a QuoteItem by its Id.
+     *
+     * @param String $quoteItemId
+     * @param AssociativeArray $giftMessage
+     * @param String $store
+     * @return AssociativeArray
+     */
+    public function setForQuoteItem($quoteItemId, $giftMessage, $store = null)
+    {
+        /** @var $quote Mage_Sales_Model_Quote_Item */
+        $quoteItem = Mage::getModel('sales/quote_item')->load($quoteItemId);
+        if (is_null($quoteItem->getId())) {
+            $this->_fault("quote_item_not_exists");
+        }
+
+        /** @var $quote Mage_Sales_Model_Quote */
+        $quote = $this->_getQuote($quoteItem->getQuoteId(), $store);
+
+        $giftMessage = $this->_prepareData($giftMessage);
+        $giftMessage['type'] = 'quote_item';
+
+        $giftMessages = array($quoteItem->getId() => $giftMessage);
+
+        $request = new Mage_Core_Controller_Request_Http();
+        $request->setParam("giftmessage", $giftMessages);
+
+        return $this->_setGiftMessage($quoteItemId, $request, $quote);
+    }
+}
diff --git a/app/code/core/Mage/GiftMessage/Model/Api/V2.php b/app/code/core/Mage/GiftMessage/Model/Api/V2.php
new file mode 100644
index 0000000000..d402a2b2fe
--- /dev/null
+++ b/app/code/core/Mage/GiftMessage/Model/Api/V2.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_GiftMessage
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * GiftMessage api
+ *
+ * @category   Mage
+ * @package    Mage_GiftMessage
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_GiftMessage_Model_Api_V2 extends Mage_GiftMessage_Model_Api
+{
+
+    /**
+     * Return an Array of Object attributes.
+     *
+     * @param Mixed $data
+     * @return Array
+     */
+    protected function _prepareData($data){
+        if (is_object($data)) {
+            $arr = get_object_vars($data);
+            foreach ($arr as $key => $value) {
+                $assocArr = array();
+                if (is_array($value)) {
+                    foreach ($value as $v) {
+                        if (is_object($v) && count(get_object_vars($v))==2
+                            && isset($v->key) && isset($v->value)) {
+                            $assocArr[$v->key] = $v->value;
+                        }
+                    }
+                }
+                if (!empty($assocArr)) {
+                    $arr[$key] = $assocArr;
+                }
+            }
+            $arr = $this->_prepareData($arr);
+            return parent::_prepareData($arr);
+        }
+        if (is_array($data)) {
+            foreach ($data as $key => $value) {
+                if (is_object($value) || is_array($value)) {
+                    $data[$key] = $this->_prepareData($value);
+                } else {
+                    $data[$key] = $value;
+                }
+            }
+            return parent::_prepareData($data);
+        }
+        return $data;
+    }
+
+    /**
+     * Raise event for setting a giftMessage.
+     *
+     * @param String $entityId
+     * @param Mage_Core_Controller_Request_Http $request
+     * @param Mage_Sales_Model_Quote $quote
+     * @return stdClass
+     */
+    protected function _setGiftMessage($entityId, $request, $quote) {
+        $response = new stdClass();
+        $response->entityId = $entityId;
+
+        /**
+         * Below code will catch exceptions only in DeveloperMode
+         * @see Mage_Core_Model_App::_callObserverMethod($object, $method, $observer)
+         * And result of Mage::dispatchEvent will always return an Object of Mage_Core_Model_App.
+         */
+        try {
+            Mage::dispatchEvent('checkout_controller_onepage_save_shipping_method', array('request'=>$request, 'quote'=>$quote));
+            $response->result = true;
+            $response->error = '';
+        } catch (Exception $e) {
+            $response->result = false;
+            $response->error = $e->getMessage();
+        }
+        return $response;
+    }
+
+}
+?>
diff --git a/app/code/core/Mage/GiftMessage/Model/Observer.php b/app/code/core/Mage/GiftMessage/Model/Observer.php
index 51b6551e80..7ac998738e 100644
--- a/app/code/core/Mage/GiftMessage/Model/Observer.php
+++ b/app/code/core/Mage/GiftMessage/Model/Observer.php
@@ -45,8 +45,15 @@ public function salesEventConvertQuoteItemToOrderItem($observer)
     {
         $orderItem = $observer->getEvent()->getOrderItem();
         $quoteItem = $observer->getEvent()->getItem();
+
+        $isAvailable = Mage::helper('giftmessage/message')->getIsMessagesAvailable(
+            'item',
+            $quoteItem,
+            $quoteItem->getStoreId()
+        );
+
         $orderItem->setGiftMessageId($quoteItem->getGiftMessageId())
-            ->setGiftMessageAvailable($this->_getAvailable($quoteItem->getProduct()));
+            ->setGiftMessageAvailable($isAvailable);
         return $this;
     }
 
@@ -81,6 +88,7 @@ public function salesEventConvertQuoteToOrder($observer)
     /**
      * Geter for available gift messages value from product
      *
+     * @deprecated after 1.5.0.0
      * @param Mage_Catalog_Model_Product|integer $product
      * @return integer|null
      */
@@ -215,7 +223,12 @@ public function salesEventOrderItemToQuoteItem($observer)
             return $this;
         }
 
-        if (!Mage::helper('giftmessage/message')->isMessagesAvailable('order_item', $orderItem, $orderItem->getStoreId())){
+        $isAvailable = Mage::helper('giftmessage/message')->isMessagesAvailable(
+            'order_item',
+            $orderItem,
+            $orderItem->getStoreId()
+        );
+        if (!$isAvailable) {
             return $this;
         }
 
diff --git a/app/code/core/Mage/GiftMessage/etc/api.xml b/app/code/core/Mage/GiftMessage/etc/api.xml
new file mode 100644
index 0000000000..ce9eeda49c
--- /dev/null
+++ b/app/code/core/Mage/GiftMessage/etc/api.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_GiftMessage
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<config>
+    <api>
+        <resources>
+            <giftmessage translate="title" module="giftmessage">
+                <model>giftmessage/api</model>
+                <title>Gift Message API</title>
+                <acl>giftmessage/set</acl>
+                <methods>
+                    <setForQuote translate="title" module="giftmessage">
+                        <title>Add gift message for shopping cart</title>
+                        <method>setForQuote</method>
+                        <acl>giftmessage/set</acl>
+                    </setForQuote>
+                    <setForQuoteItem translate="title" module="giftmessage">
+                        <title>Add gift messages for quote item of shopping cart</title>
+                        <method>setForQuoteItem</method>
+                        <acl>giftmessage/set</acl>
+                    </setForQuoteItem>
+                    <setForQuoteProduct translate="title" module="giftmessage">
+                        <title>Add gift messages to products of shopping cart</title>
+                        <method>setForQuoteProduct</method>
+                        <acl>giftmessage/set</acl>
+                    </setForQuoteProduct>
+                </methods>
+                <faults module="giftmessage">
+                    <store_not_exists>
+                        <code>1001</code>
+                        <message>Can not make operation because store is not exists</message>
+                    </store_not_exists>
+                    <quote_not_exists>
+                        <code>1002</code>
+                        <message>Can not make operation because quote is not exists</message>
+                    </quote_not_exists>
+                    <giftmessage_invalid_data>
+                        <code>1101</code>
+                        <message>Gift message data is not valid.</message>
+                    </giftmessage_invalid_data>
+                    <product_invalid_data>
+                        <code>1102</code>
+                        <message>Product's data is not valid.</message>
+                    </product_invalid_data>
+                    <quote_item_not_exists>
+                        <code>1103</code>
+                        <message>Quote item is not exists</message>
+                    </quote_item_not_exists>
+                </faults>
+            </giftmessage>
+        </resources>
+        <acl>
+            <resources>
+                <giftmessage translate="title" module="checkout">
+                    <title>Gift Message</title>
+                    <set translate="title" module="checkout">
+                        <title>Add gift messages to shopping cart</title>
+                    </set>
+                </giftmessage>
+            </resources>
+        </acl>
+        <v2>
+            <resources_function_prefix>
+                <giftmessage>giftMessage</giftmessage>
+            </resources_function_prefix>
+        </v2>
+    </api>
+</config>
diff --git a/app/code/core/Mage/GiftMessage/etc/wsdl.xml b/app/code/core/Mage/GiftMessage/etc/wsdl.xml
new file mode 100644
index 0000000000..9fd677d2ca
--- /dev/null
+++ b/app/code/core/Mage/GiftMessage/etc/wsdl.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns:typens="urn:{{var wsdl.name}}" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/"
+    name="{{var wsdl.name}}" targetNamespace="urn:{{var wsdl.name}}">
+    <types>
+        <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:Magento">
+            <import namespace="http://schemas.xmlsoap.org/soap/encoding/" schemaLocation="http://schemas.xmlsoap.org/soap/encoding/" />
+            <complexType name="giftMessageEntity">
+                <sequence>
+                    <element name="from" type="xsd:string" minOccurs="0" />
+                    <element name="to" type="xsd:string" minOccurs="0" />
+                    <element name="message" type="xsd:string" minOccurs="0" />
+                </sequence>
+            </complexType>
+            <complexType name="giftMessageResponse">
+                <sequence>
+                    <element name="entityId" type="xsd:string" minOccurs="0" />
+                    <element name="result" type="xsd:boolean" minOccurs="0" />
+                    <element name="error" type="xsd:string" minOccurs="0" />
+                </sequence>
+            </complexType>
+            <complexType name="giftMessageResponseArray">
+                <complexContent>
+                    <restriction base="soapenc:Array">
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:giftMessageResponse[]" />
+                    </restriction>
+                </complexContent>
+            </complexType>
+            <complexType name="giftMessageAssociativeProductsEntity">
+                <sequence>
+                    <element name="product" type="typens:shoppingCartProductEntity" />
+                    <element name="message" type="typens:giftMessageEntity" />
+                </sequence>
+            </complexType>
+            <complexType name="giftMessageAssociativeProductsEntityArray">
+                <complexContent>
+                    <restriction base="soapenc:Array">
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:giftMessageAssociativeProductsEntity[]" />
+                    </restriction>
+                </complexContent>
+            </complexType>
+        </schema>
+    </types>
+    <message name="giftMessageForQuoteRequest">
+        <part name="sessionId" type="xsd:string" />
+        <part name="quoteId" type="xsd:string" />
+        <part name="giftMessage" type="typens:giftMessageEntity" />
+        <part name="storeId" type="xsd:string" />
+    </message>
+    <message name="giftMessageForQuoteResponse">
+        <part name="result" type="typens:giftMessageResponse" />
+    </message>
+    <message name="giftMessageForQuoteItemRequest">
+        <part name="sessionId" type="xsd:string" />
+        <part name="quoteItemId" type="xsd:string" />
+        <part name="giftMessage" type="typens:giftMessageEntity" />
+        <part name="storeId" type="xsd:string" />
+    </message>
+    <message name="giftMessageForQuoteItemResponse">
+        <part name="result" type="typens:giftMessageResponse" />
+    </message>
+    <message name="giftMessageForQuoteProductRequest">
+        <part name="sessionId" type="xsd:string" />
+        <part name="quoteId" type="xsd:string" />
+        <part name="productsAndMessages" type="typens:giftMessageAssociativeProductsEntityArray" />
+        <part name="storeId" type="xsd:string" />
+    </message>
+    <message name="giftMessageForQuoteProductResponse">
+        <part name="result" type="typens:giftMessageResponseArray" />
+    </message>
+    <portType name="{{var wsdl.handler}}PortType">
+        <operation name="giftMessageSetForQuote">
+            <documentation>Set a gift message to the cart</documentation>
+            <input message="typens:giftMessageForQuoteRequest" />
+            <output message="typens:giftMessageForQuoteResponse" />
+        </operation>
+        <operation name="giftMessageSetForQuoteItem">
+            <documentation>Setting a gift messages to the quote item</documentation>
+            <input message="typens:giftMessageForQuoteItemRequest" />
+            <output message="typens:giftMessageForQuoteItemResponse" />
+        </operation>
+        <operation name="giftMessageSetForQuoteProduct">
+            <documentation>Setting a gift messages to the quote items by products</documentation>
+            <input message="typens:giftMessageForQuoteProductRequest" />
+            <output message="typens:giftMessageForQuoteProductResponse" />
+        </operation>
+    </portType>
+    <binding name="{{var wsdl.handler}}Binding" type="typens:{{var wsdl.handler}}PortType">
+        <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
+        <operation name="giftMessageSetForQuote">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <input>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+            </input>
+            <output>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+            </output>
+        </operation>
+        <operation name="giftMessageSetForQuoteItem">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <input>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+            </input>
+            <output>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+            </output>
+        </operation>
+        <operation name="giftMessageSetForQuoteProduct">
+            <soap:operation soapAction="urn:{{var wsdl.handler}}Action" />
+            <input>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+            </input>
+            <output>
+                <soap:body namespace="urn:{{var wsdl.name}}" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+            </output>
+        </operation>
+    </binding>
+    <service name="{{var wsdl.name}}Service">
+        <port name="{{var wsdl.handler}}Port" binding="typens:{{var wsdl.handler}}Binding">
+            <soap:address location="{{var wsdl.url}}" />
+        </port>
+    </service>
+</definitions>
diff --git a/app/code/core/Mage/GiftMessage/etc/wsi.xml b/app/code/core/Mage/GiftMessage/etc/wsi.xml
new file mode 100644
index 0000000000..155d52646b
--- /dev/null
+++ b/app/code/core/Mage/GiftMessage/etc/wsi.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:typens="urn:{{var wsdl.name}}"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+             name="{{var wsdl.name}}"
+             targetNamespace="urn:{{var wsdl.name}}">
+    <wsdl:types>
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:{{var wsdl.name}}">
+            <xsd:complexType name="giftMessageEntity">
+                <xsd:sequence>
+                    <xsd:element name="from" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="to" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="message" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="giftMessageResponse">
+                <xsd:sequence>
+                    <xsd:element name="entityId" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="result" type="xsd:boolean" minOccurs="0" />
+                    <xsd:element name="error" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="giftMessageResponseArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:giftMessageResponse" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="giftMessageAssociativeProductsEntity">
+                <xsd:sequence>
+                    <xsd:element name="product" type="typens:shoppingCartProductEntity" />
+                    <xsd:element name="message" type="typens:giftMessageEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="giftMessageAssociativeProductsEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:giftMessageAssociativeProductsEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+
+
+            <xsd:element name="giftMessageForQuoteRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="giftMessage" type="typens:giftMessageEntity" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="giftMessageForQuoteResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:giftMessageResponse" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="giftMessageForQuoteItemRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteItemId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="giftMessage" type="typens:giftMessageEntity" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="giftMessageForQuoteItemResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:giftMessageResponse" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="giftMessageForQuoteProductRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="quoteId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="productsAndMessages" type="typens:giftMessageAssociativeProductsEntityArray" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="store" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="giftMessageForQuoteProductResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:giftMessageResponseArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="giftMessageForQuoteRequest">
+        <wsdl:part name="parameters" element="typens:giftMessageForQuoteRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="giftMessageForQuoteResponse">
+        <wsdl:part name="parameters" element="typens:giftMessageForQuoteResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="giftMessageForQuoteItemRequest">
+        <wsdl:part name="parameters" element="typens:giftMessageForQuoteItemRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="giftMessageForQuoteItemResponse">
+        <wsdl:part name="parameters" element="typens:giftMessageForQuoteItemResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="giftMessageForQuoteProductRequest">
+        <wsdl:part name="parameters" element="typens:giftMessageForQuoteProductRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="giftMessageForQuoteProductResponse">
+        <wsdl:part name="parameters" element="typens:giftMessageForQuoteProductResponseParam" />
+    </wsdl:message>
+    <wsdl:portType name="{{var wsdl.handler}}PortType">
+        <wsdl:operation name="giftMessageSetForQuote">
+            <wsdl:documentation>Set a gift message to the cart</wsdl:documentation>
+            <wsdl:input message="typens:giftMessageForQuoteRequest" />
+            <wsdl:output message="typens:giftMessageForQuoteResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="giftMessageSetForQuoteItem">
+            <wsdl:documentation>Setting a gift messages to the quote item</wsdl:documentation>
+            <wsdl:input message="typens:giftMessageForQuoteItemRequest" />
+            <wsdl:output message="typens:giftMessageForQuoteItemResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="giftMessageSetForQuoteProduct">
+            <wsdl:documentation>Setting a gift messages to the quote items by products</wsdl:documentation>
+            <wsdl:input message="typens:giftMessageForQuoteProductRequest" />
+            <wsdl:output message="typens:giftMessageForQuoteProductResponse" />
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="{{var wsdl.handler}}Binding" type="typens:{{var wsdl.handler}}PortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="giftMessageSetForQuote">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="giftMessageSetForQuoteItem">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="giftMessageSetForQuoteProduct">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+</wsdl:definitions>
diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Item.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Item.php
index f17a9a5004..513c202414 100644
--- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Item.php
+++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Item.php
@@ -107,14 +107,6 @@ protected function _prepareColumns()
                 'filter'    => false,
         ));
 
-        $this->addColumn('views',
-            array(
-                'header'    => $this->__('Page views'),
-                'width'     => '150px',
-                'index'     => 'views',
-                'filter'    => false,
-        ));
-
         $this->addColumn('active',
             array(
                 'header'    => $this->__('Active'),
diff --git a/app/code/core/Mage/GoogleBase/Model/Service/Feed.php b/app/code/core/Mage/GoogleBase/Model/Service/Feed.php
index 6fed027134..9e467410f2 100644
--- a/app/code/core/Mage/GoogleBase/Model/Service/Feed.php
+++ b/app/code/core/Mage/GoogleBase/Model/Service/Feed.php
@@ -63,6 +63,11 @@ public function getItemStats($id, $storeId = null)
         if (!stristr($id, 'http://')) {
             $id = self::ITEMS_LOCATION . '/' . $id;
         }
+        if (!strstr($id, '?')) {
+            $id = $id . '?content=attributes,meta';
+        } elseif (!stristr($id, 'content=')) {
+            $id = $id . '&content=attributes,meta';
+        }
         try {
             $entry = $this->getService($storeId)->getGbaseItemEntry($id);
             return $this->_getEntryStats($entry);
@@ -79,7 +84,7 @@ public function getItemStats($id, $storeId = null)
      */
     protected function _getEntryStats($entry)
     {
-        $result = array();
+        $result = $_stats = array();
 
         $draft = 'no';
         if (is_object($entry->getControl()) && is_object($entry->getControl()->getDraft())) {
@@ -89,9 +94,39 @@ protected function _getEntryStats($entry)
 
         $expirationDate = $entry->getGbaseAttribute('expiration_date');
         if (isset($expirationDate[0]) && is_object($expirationDate[0])) {
-            $result['expires'] = Mage::getSingleton('googlebase/service_item')->gBaseDate2DateTime($expirationDate[0]->getText());
+            $result['expires'] = Mage::getSingleton('googlebase/service_item')
+                                    ->gBaseDate2DateTime($expirationDate[0]->getText());
         }
 
+        $allAttributes = $entry->getExtensionElements();
+        $elementsCount = count($allAttributes);
+        if($elementsCount) {
+            $statsElement = null;
+            for ($i = 0; $i < $elementsCount; $i++) {
+                /**
+                 * @var $extAttribute Zend_Gdata_App_Extension_Element
+                 */
+                $extAttribute = $allAttributes[$i];
+                if ((string)$extAttribute->rootElement == 'stats') {
+                    $statsElement = $extAttribute;
+                    break;
+                }
+            }
+            if ($statsElement) {
+                $_stats = $statsElement->getExtensionElements();
+            }
+            $statsCount = count($_stats);
+            for ($i = 0; $i < $statsCount; $i++) {
+                /**
+                 * @var $_currentElement Zend_Gdata_App_Extension_Element
+                 */
+                $_currentElement = $_stats[$i];
+                $_currentAttributes = $_currentElement->getExtensionAttributes();
+                if (isset($_currentAttributes['total']) && isset($_currentAttributes['total']['value'])) {
+                    $result[(string)$_currentElement->rootElement] = $_currentAttributes['total']['value'];
+                }
+            }
+        }
         return $result;
     }
 
diff --git a/app/code/core/Mage/GoogleBase/controllers/Adminhtml/Googlebase/ItemsController.php b/app/code/core/Mage/GoogleBase/controllers/Adminhtml/Googlebase/ItemsController.php
index 1623a0c4e6..266e1f6bb7 100755
--- a/app/code/core/Mage/GoogleBase/controllers/Adminhtml/Googlebase/ItemsController.php
+++ b/app/code/core/Mage/GoogleBase/controllers/Adminhtml/Googlebase/ItemsController.php
@@ -67,11 +67,7 @@ public function indexAction()
         if (!$this->_getConfig()->isValidBaseCurrencyCode($this->_getStore()->getId())) {
             $_countryInfo = $this->_getConfig()->getTargetCountryInfo($this->_getStore()->getId());
             $this->_getSession()->addNotice(
-                $this->__(
-                    "Base Currency should be set to %s for %s in system configuration. Otherwise item prices won't be correct in Google Base.",
-                    $_countryInfo['currency_name'],
-                    $_countryInfo['name']
-                )
+                $this->__("Base Currency should be set to %s for %s in system configuration. Otherwise item prices won't be correct in Google Base.",$_countryInfo['currency_name'],$_countryInfo['name'])
             );
         }
 
@@ -183,11 +179,13 @@ public function massPublishAction()
         $totalPublished = 0;
 
         try {
-            foreach ($itemIds as $itemId) {
-                $item = Mage::getModel('googlebase/item')->load($itemId);
-                if ($item->getId()) {
-                    $item->activateItem();
-                    $totalPublished++;
+            if (!empty($itemIds) && is_array($itemIds)) {
+                foreach ($itemIds as $itemId) {
+                    $item = Mage::getModel('googlebase/item')->load($itemId);
+                    if ($item->getId()) {
+                        $item->activateItem();
+                        $totalPublished++;
+                    }
                 }
             }
             if ($totalPublished > 0) {
@@ -270,6 +268,14 @@ public function refreshAction()
                     $item->setIsHidden($stats['draft']);
                 }
 
+                if (isset($stats['clicks'])) {
+                    $item->setClicks($stats['clicks']);
+                }
+
+                if (isset($stats['impressions'])) {
+                    $item->setImpr($stats['impressions']);
+                }
+
                 if (isset($stats['expires'])) {
                     $item->setExpires($stats['expires']);
                 }
diff --git a/app/code/core/Mage/GoogleCheckout/Helper/Data.php b/app/code/core/Mage/GoogleCheckout/Helper/Data.php
index 4811d5c13b..b631ec5488 100644
--- a/app/code/core/Mage/GoogleCheckout/Helper/Data.php
+++ b/app/code/core/Mage/GoogleCheckout/Helper/Data.php
@@ -29,5 +29,45 @@
  */
 class Mage_GoogleCheckout_Helper_Data extends Mage_Core_Helper_Abstract
 {
+    /**
+     * Google Checkout settings
+     */
+    const XML_PATH_REQUEST_PHONE                     = 'google/checkout/request_phone';
+    const XML_PATH_DISABLE_DEFAULT_TAX_TABLES        = 'google/checkout/disable_default_tax_tables';
 
+    /**
+     * Google Checkout Shipping - Digital Delivery settings
+     */
+    const XML_PATH_SHIPPING_VIRTUAL_ACTIVE           = 'google/checkout_shipping_virtual/active';
+    const XML_PATH_SHIPPING_VIRTUAL_SCHEDULE         = 'google/checkout_shipping_virtual/schedule';
+    const XML_PATH_SHIPPING_VIRTUAL_METHOD           = 'google/checkout_shipping_virtual/method';
+
+    /**
+     * Google Checkout Shipping - Carrier Calculated settings
+     */
+    const XML_PATH_SHIPPING_CARRIER_ACTIVE           = 'google/checkout_shipping_carrier/active';
+    const XML_PATH_SHIPPING_CARRIER_METHODS          = 'google/checkout_shipping_carrier/methods';
+    const XML_PATH_SHIPPING_CARRIER_DEFAULT_PRICE    = 'google/checkout_shipping_carrier/default_price';
+    const XML_PATH_SHIPPING_CARRIER_DEFAULT_WIDTH    = 'google/checkout_shipping_carrier/default_width';
+    const XML_PATH_SHIPPING_CARRIER_DEFAULT_HEIGHT   = 'google/checkout_shipping_carrier/default_height';
+    const XML_PATH_SHIPPING_CARRIER_DEFAULT_LENGTH   = 'google/checkout_shipping_carrier/default_length';
+    const XML_PATH_SHIPPING_CARRIER_ADDRESS_CATEGORY = 'google/checkout_shipping_carrier/address_category';
+
+    /**
+     * Google Checkout Shipping - Flat Rate settings
+     */
+    const XML_PATH_SHIPPING_FLATRATE_ACTIVE          = 'google/checkout_shipping_flatrate/active';
+
+    /**
+     * Google Checkout Shipping - Merchant Calculated settings
+     */
+    const XML_PATH_SHIPPING_MERCHANT_ACTIVE          = 'google/checkout_shipping_merchant/active';
+    const XML_PATH_SHIPPING_MERCHANT_ALLOWED_METHODS = 'google/checkout_shipping_merchant/allowed_methods';
+
+    /**
+     * Google Checkout Shipping - Pickup settings
+     */
+    const XML_PATH_SHIPPING_PICKUP_ACTIVE            = 'google/checkout_shipping_pickup/active';
+    const XML_PATH_SHIPPING_PICKUP_TITLE             = 'google/checkout_shipping_pickup/title';
+    const XML_PATH_SHIPPING_PICKUP_PRICE             = 'google/checkout_shipping_pickup/price';
 }
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php
index ec509a9c53..b6bc33992c 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php
@@ -24,28 +24,71 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+/**
+ * Google Checkout XML API processing model
+ *
+ * @category    Mage
+ * @package     Mage_GoogleCheckout
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
 class Mage_GoogleCheckout_Model_Api_Xml_Checkout extends Mage_GoogleCheckout_Model_Api_Xml_Abstract
 {
+    /**
+     * Representation value of item weight unit
+     */
+    const ITEM_WEIGHT_UNIT = 'LB';
+
+    /**
+     * Representation value of item size unit
+     */
+    const ITEM_SIZE_UNIT = 'IN';
+
+    /**
+     * Google checkout namespace URI
+     */
+    const CHECKOUT_SHOPPING_CART_XMLNS = 'http://checkout.google.com/schema/2';
+
+    /**
+     * @deprecated after 0.8.16100
+     *
+     * @var string
+     */
     protected $_currency;
+
+    /**
+     * Define if shipping rates already calculated
+     *
+     * @var boolean
+     */
     protected $_shippingCalculated = false;
 
+    /**
+     * API URL getter
+     *
+     * @return string
+     */
     protected function _getApiUrl()
     {
         $url = $this->_getBaseApiUrl();
-        $url .= 'merchantCheckout/Merchant/'.$this->getMerchantId();
+        $url .= 'merchantCheckout/Merchant/' . $this->getMerchantId();
         return $url;
     }
 
+    /**
+     * Send checkout data to google
+     *
+     * @return Mage_GoogleCheckout_Model_Api_Xml_Checkout
+     */
     public function checkout()
     {
         $quote = $this->getQuote();
-
         if (!($quote instanceof Mage_Sales_Model_Quote)) {
             Mage::throwException('Invalid quote');
         }
 
+        $xmlns = self::CHECKOUT_SHOPPING_CART_XMLNS;
         $xml = <<<EOT
-<checkout-shopping-cart xmlns="http://checkout.google.com/schema/2">
+<checkout-shopping-cart xmlns="{$xmlns}">
     <shopping-cart>
 {$this->_getItemsXml()}
 {$this->_getMerchantPrivateDataXml()}
@@ -59,27 +102,32 @@ public function checkout()
     </order-processing-support>
 </checkout-shopping-cart>
 EOT;
-#echo "<xmp>".$xml."</xmp>";
-        $result = $this->_call($xml);
 
+        $result = $this->_call($xml);
         $this->setRedirectUrl($result->{'redirect-url'});
 
         return $this;
     }
 
+    /**
+     * Retrieve quote items in XML format
+     *
+     * @return string
+     */
     protected function _getItemsXml()
     {
         $xml = <<<EOT
         <items>
 
 EOT;
-        $weightUnit = 'LB';
+
         foreach ($this->getQuote()->getAllItems() as $item) {
             if ($item->getParentItem()) {
                 continue;
             }
-            $taxClass = ($item->getTaxClassId() == 0 ? 'none' : $item->getTaxClassId());
-            $weight = (float) $item->getWeight();
+            $taxClass   = ($item->getTaxClassId() == 0) ? 'none' : $item->getTaxClassId();
+            $weight     = (float) $item->getWeight();
+            $weightUnit = self::ITEM_WEIGHT_UNIT;
 
             $xml .= <<<EOT
             <item>
@@ -97,23 +145,29 @@ protected function _getItemsXml()
 EOT;
         }
 
-        $shippingDiscount = (float)$this->getQuote()->getShippingAddress()->getBaseDiscountAmount();
-        $billingDiscount = (float)$this->getQuote()->getBillingAddress()->getBaseDiscountAmount();
+        $billingAddress = $this->getQuote()->getBillingAddress();
+        $shippingAddress = $this->getQuote()->getShippingAddress();
+
+        $shippingDiscount = (float)$shippingAddress->getBaseDiscountAmount();
+        $billingDiscount = (float)$billingAddress->getBaseDiscountAmount();
         $discount = $billingDiscount + $shippingDiscount;
 
-        // exclude shipping discount
-        // discount is negative value
-        $discount += $this->getQuote()->getShippingAddress()->getBaseShippingDiscountAmount();
+        // Exclude shipping discount
+        // Discount is negative value
+        $discount += $shippingAddress->getBaseShippingDiscountAmount();
 
         $discountItem = new Varien_Object(array(
-                'price' => $discount,
-                'name'  => $this->__('Cart Discount'),
-                'description' => $this->__('A virtual item to reflect the discount total')
-            ));
+            'price' => $discount,
+            'name'  => $this->__('Cart Discount'),
+            'description' => $this->__('A virtual item to reflect the discount total')
+        ));
 
-        Mage::dispatchEvent('google_checkout_discount_item_price', array('quote' => $this->getQuote(), 'discount_item' => $discountItem));
-        $discount = $discountItem->getPrice();
+        Mage::dispatchEvent('google_checkout_discount_item_price', array(
+            'quote'         => $this->getQuote(),
+            'discount_item' => $discountItem
+        ));
 
+        $discount = $discountItem->getPrice();
         if ($discount) {
             $xml .= <<<EOT
             <item>
@@ -129,8 +183,8 @@ protected function _getItemsXml()
 
 EOT;
         }
-        $hiddenTax = $this->getQuote()->getShippingAddress()->getBaseHiddenTaxAmount()
-            + $this->getQuote()->getBillingAddress()->getBaseHiddenTaxAmount();
+
+        $hiddenTax = $shippingAddress->getBaseHiddenTaxAmount() + $billingAddress->getBaseHiddenTaxAmount();
         if ($hiddenTax) {
             $xml .= <<<EOT
             <item>
@@ -143,33 +197,40 @@ protected function _getItemsXml()
                 <tax-table-selector>none</tax-table-selector>
                 {$this->_getDigitalContentXml($this->getQuote()->isVirtual())}
             </item>
-
 EOT;
         }
         $xml .= <<<EOT
         </items>
 EOT;
+
         return $xml;
     }
 
+    /**
+     * Retrieve digital content XML
+     *
+     * @param boolean $isVirtual
+     * @return string
+     */
     protected function _getDigitalContentXml($isVirtual)
     {
         if (!$isVirtual) {
             return '';
         }
 
-        $active = Mage::getStoreConfigFlag('google/checkout_shipping_virtual/active', $this->getQuote()->getStoreId());
+        $storeId = $this->getQuote()->getStoreId();
+        $active = Mage::getStoreConfigFlag(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_VIRTUAL_ACTIVE, $storeId);
         if (!$active) {
             return '';
         }
 
-        $schedule = Mage::getStoreConfig('google/checkout_shipping_virtual/schedule', $this->getQuote()->getStoreId());
-        $method = Mage::getStoreConfig('google/checkout_shipping_virtual/method', $this->getQuote()->getStoreId());
+        $schedule = Mage::getStoreConfig(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_VIRTUAL_SCHEDULE, $storeId);
+        $method   = Mage::getStoreConfig(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_VIRTUAL_METHOD, $storeId);
 
         $xml = "<display-disposition>{$schedule}</display-disposition>";
 
         if ($method == 'email') {
-            $xml .= "<email-delivery>true</email-delivery>";
+            $xml .= '<email-delivery>true</email-delivery>';
         } elseif ($method == 'key_url') {
         } elseif ($method == 'description_based') {
         }
@@ -179,11 +240,27 @@ protected function _getDigitalContentXml($isVirtual)
         return $xml;
     }
 
+    /**
+     * Convert quote item to private item XML
+     *
+     * @param Mage_Sales_Model_Quote_Item $item
+     * @return string
+     */
     protected function _getMerchantPrivateItemDataXml($item)
     {
-        $xml = "<merchant-private-item-data><quote-item-id>{$item->getId()}</quote-item-id></merchant-private-item-data>";
+        $xml = <<<EOT
+            <merchant-private-item-data>
+                <quote-item-id>{$item->getId()}</quote-item-id>
+            </merchant-private-item-data>
+EOT;
         return $xml;
     }
+
+    /**
+     * Retrieve merchant private data XML
+     *
+     * @return string
+     */
     protected function _getMerchantPrivateDataXml()
     {
         $xml = <<<EOT
@@ -195,6 +272,11 @@ protected function _getMerchantPrivateDataXml()
         return $xml;
     }
 
+    /**
+     * Retrieve quote expiration XML
+     *
+     * @return string
+     */
     protected function _getCartExpirationXml()
     {
         $xml = <<<EOT
@@ -202,6 +284,11 @@ protected function _getCartExpirationXml()
         return $xml;
     }
 
+    /**
+     * Retrieve merchant checkout flow support XML
+     *
+     * @return string
+     */
     protected function _getMerchantCheckoutFlowSupportXml()
     {
         $xml = <<<EOT
@@ -220,15 +307,29 @@ protected function _getMerchantCheckoutFlowSupportXml()
         return $xml;
     }
 
+    /**
+     * Retrieve request buyer phone number XML
+     *
+     * @return string
+     */
     protected function _getRequestBuyerPhoneNumberXml()
     {
-        $requestPhone = Mage::getStoreConfig('google/checkout/request_phone', $this->getQuote()->getStoreId()) ? 'true' : 'false';
+        $requestPhone = Mage::getStoreConfig(
+            Mage_GoogleCheckout_Helper_Data::XML_PATH_REQUEST_PHONE,
+            $this->getQuote()->getStoreId()
+        );
+        $requestPhone = $requestPhone ? 'true' : 'false';
         $xml = <<<EOT
             <request-buyer-phone-number>{$requestPhone}</request-buyer-phone-number>
 EOT;
         return $xml;
     }
 
+    /**
+     * Retrieve merchant calculations XML
+     *
+     * @return string
+     */
     protected function _getMerchantCalculationsXml()
     {
         $xml = <<<EOT
@@ -239,6 +340,11 @@ protected function _getMerchantCalculationsXml()
         return $xml;
     }
 
+    /**
+     * Retrieve free shipping rate XML
+     *
+     * @return string
+     */
     protected function _getVirtualOrderShippingXml()
     {
         $title = Mage::helper('googlecheckout')->__('Free Shipping');
@@ -254,6 +360,11 @@ protected function _getVirtualOrderShippingXml()
         return $xml;
     }
 
+    /**
+     * Retrieve shipping methods XML
+     *
+     * @return string
+     */
     protected function _getShippingMethodsXml()
     {
         if ($this->_isOrderVirtual()) {
@@ -271,40 +382,106 @@ protected function _getShippingMethodsXml()
         return $xml;
     }
 
+    /**
+     * Generate XML of calculated shipping carriers rates
+     *
+     * @return string
+     */
     protected function _getCarrierCalculatedShippingXml()
     {
         /*
-        we want to send ONLY ONE shipping option to google
-        */
+         * Prevent sending more then one shipping option to Google
+         */
         if ($this->_shippingCalculated) {
             return '';
         }
 
-        $active = Mage::getStoreConfigFlag('google/checkout_shipping_carrier/active', $this->getQuote()->getStoreId());
-        $methods = Mage::getStoreConfig('google/checkout_shipping_carrier/methods', $this->getQuote()->getStoreId());
+        $storeId = $this->getQuote()->getStoreId();
+        $active = Mage::getStoreConfigFlag(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_CARRIER_ACTIVE, $storeId);
+        $methods = Mage::getStoreConfig(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_CARRIER_METHODS, $storeId);
+
         if (!$active || !$methods) {
             return '';
         }
 
-        $country = Mage::getStoreConfig('shipping/origin/country_id', $this->getQuote()->getStoreId());
-        $region = Mage::getStoreConfig('shipping/origin/region_id', $this->getQuote()->getStoreId());
-        $postcode = Mage::getStoreConfig('shipping/origin/postcode', $this->getQuote()->getStoreId());
-        $city = Mage::getStoreConfig('shipping/origin/city', $this->getQuote()->getStoreId());
+        $country  = Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_COUNTRY_ID, $storeId);
+        $region   = Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_REGION_ID, $storeId);
+        $postcode = Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_POSTCODE, $storeId);
+        $city     = Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_CITY, $storeId);
+
+        $defPrice = (float)Mage::getStoreConfig(
+            Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_CARRIER_DEFAULT_PRICE,
+            $storeId
+        );
+        $width = Mage::getStoreConfig(
+            Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_CARRIER_DEFAULT_WIDTH,
+            $storeId
+        );
+        $height = Mage::getStoreConfig(
+            Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_CARRIER_DEFAULT_HEIGHT,
+            $storeId
+        );
+        $length = Mage::getStoreConfig(
+            Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_CARRIER_DEFAULT_LENGTH,
+            $storeId
+        );
+        $sizeUnit = self::ITEM_SIZE_UNIT;
+
+        $addressCategory = Mage::getStoreConfig(
+            Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_CARRIER_ADDRESS_CATEGORY,
+            $storeId
+        );
+        $defPrice = (float) Mage::helper('tax')->getShippingPrice($defPrice, false, false);
 
-        $sizeUnit = 'IN';#Mage::getStoreConfig('google/checkout_shipping_carrier/default_unit');
-        $defPrice = (float)Mage::getStoreConfig('google/checkout_shipping_carrier/default_price', $this->getQuote()->getStoreId());
-        $width = Mage::getStoreConfig('google/checkout_shipping_carrier/default_width', $this->getQuote()->getStoreId());
-        $height = Mage::getStoreConfig('google/checkout_shipping_carrier/default_height', $this->getQuote()->getStoreId());
-        $length = Mage::getStoreConfig('google/checkout_shipping_carrier/default_length', $this->getQuote()->getStoreId());
+        $this->getQuote()->getShippingAddress()
+            ->setCountryId($country)
+            ->setCity($city)
+            ->setPostcode($postcode)
+            ->setRegionId($region)
+            ->setCollectShippingRates(true);
 
-        $addressCategory = Mage::getStoreConfig('google/checkout_shipping_carrier/address_category', $this->getQuote()->getStoreId());
+        $address = $this->getQuote()->getShippingAddress();
+        $address->collectShippingRates();
+        $shipments = $address->getGroupedAllShippingRates();
 
-        $defPrice = (float) Mage::helper('tax')->getShippingPrice($defPrice, false, false);
+        $shippingMethodsList = array();
+        foreach (explode(',', $methods) as $method) {
+            list($company, $type) = explode('/', $method);
+            $shippingMethodsList[$method] = array('company' => $company, 'type' => $type);
+        }
 
-//      $taxRate = $this->_getShippingTaxRate();
-//      <additional-variable-charge-percent>{$taxRate}</additional-variable-charge-percent>
+        $freeMethodsList = array();
+        foreach ($this->_getGoogleCarriersMap() as $mageCode => $map) {
+            if (!isset($shipments[$mageCode])) {
+                continue;
+            }
+            $freeMethod = Mage::getStoreConfig('carriers/' . $mageCode . '/free_method', $storeId);
 
-        $xml = <<<EOT
+            foreach ($shipments[$mageCode] as $rate) {
+                $mageRateCode = $rate->getMethod();
+                if ($mageRateCode != $freeMethod) {
+                    continue;
+                }
+                $googleRateCode = isset($map['methods'][$mageRateCode]) ? $map['methods'][$mageRateCode] : false;
+                if (false == $googleRateCode || $rate->getPrice() != 0) {
+                    continue;
+                }
+                $methodName = $map['googleCarrierCompany'] . '/'.  $googleRateCode;
+                if (empty($shippingMethodsList[$methodName])) {
+                    continue;
+                }
+                $freeMethodsList[$methodName] = array(
+                    'company' => $map['googleCarrierCompany'],
+                    'type' => $googleRateCode
+                );
+                unset($shippingMethodsList[$methodName]);
+            }
+        }
+
+        $xml = '';
+        $sendShipMethods = (bool)count($shippingMethodsList) > 0;
+        if ($sendShipMethods) {
+            $xml .= <<<EOT
                 <carrier-calculated-shipping>
                     <shipping-packages>
                         <shipping-package>
@@ -320,55 +497,74 @@ protected function _getCarrierCalculatedShippingXml()
                             <delivery-address-category>{$addressCategory}</delivery-address-category>
                         </shipping-package>
                     </shipping-packages>
-                    <carrier-calculated-shipping-options>
 EOT;
+            $xml .= '<carrier-calculated-shipping-options>';
 
-        foreach (explode(',', $methods) as $method) {
-            list($company, $type) = explode('/', $method);
-            $xml .= <<<EOT
+            foreach ($shippingMethodsList as $method) {
+                $xml .= <<<EOT
                         <carrier-calculated-shipping-option>
-                            <shipping-company>{$company}</shipping-company>
-                            <shipping-type>{$type}</shipping-type>
+                            <shipping-company>{$method['company']}</shipping-company>
+                            <shipping-type>{$method['type']}</shipping-type>
                             <price currency="{$this->getCurrency()}">{$defPrice}</price>
                         </carrier-calculated-shipping-option>
 EOT;
+            }
+            $xml .= '</carrier-calculated-shipping-options>';
+            $xml .= '</carrier-calculated-shipping>';
         }
 
-        $xml .= <<<EOT
-                    </carrier-calculated-shipping-options>
-                </carrier-calculated-shipping>
+        foreach ($freeMethodsList as $method) {
+            $xml .= <<<EOT
+                    <flat-rate-shipping name="{$method['company']} {$method['type']}">
+                    <price currency="{$this->getCurrency()}">0.00</price></flat-rate-shipping>
 EOT;
+        }
+
         $this->_shippingCalculated = true;
         return $xml;
     }
 
+    /**
+     * Generate flat rate shipping XML
+     *
+     * @return string
+     */
     protected function _getFlatRateShippingXml()
     {
         /*
-        we want to send ONLY ONE shipping option to google
-        */
+         * Prevent sending more then one shipping option to Google
+         */
         if ($this->_shippingCalculated) {
             return '';
         }
 
-        if (!Mage::getStoreConfigFlag('google/checkout_shipping_flatrate/active', $this->getQuote()->getStoreId())) {
+        $storeId = $this->getQuote()->getStoreId();
+        if (!Mage::getStoreConfigFlag(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_FLATRATE_ACTIVE, $storeId)) {
             return '';
         }
 
-        //if isset Tax Class for Shipping - create abbility to manage shipping rates in MerchantCalculationCallback
-        $nodeName = $this->_getTaxClassForShipping($this->getQuote()) ?
-            'merchant-calculated-shipping' : 'flat-rate-shipping';
+        // If is set Tax Class for Shipping - create ability to manage shipping rates in MerchantCalculationCallback
+        $nodeName = 'merchant-calculated-shipping';
+        if (!$this->_getTaxClassForShipping($this->getQuote())) {
+            $nodeName = 'flat-rate-shipping';
+        }
 
-        for ($xml='', $i=1; $i<=3; $i++) {
-            $allowSpecific = Mage::getStoreConfigFlag('google/checkout_shipping_flatrate/sallowspecific_'.$i, $this->getQuote()->getStoreId());
-            $specificCountries = Mage::getStoreConfig('google/checkout_shipping_flatrate/specificcountry_'.$i, $this->getQuote()->getStoreId());
+        $xml = '';
+        for ($i = 1; $i <= 3; $i++) {
+            $title         = Mage::getStoreConfig('google/checkout_shipping_flatrate/title_' . $i, $storeId);
+            $price         = (float)Mage::getStoreConfig('google/checkout_shipping_flatrate/price_' . $i, $storeId);
+            $price         = number_format($price, 2, '.', '');
+            $price         = (float)Mage::helper('tax')->getShippingPrice($price, false, false);
+            $allowSpecific = Mage::getStoreConfigFlag(
+                'google/checkout_shipping_flatrate/sallowspecific_' . $i,
+                $storeId
+            );
+            $specificCountries = Mage::getStoreConfig(
+                'google/checkout_shipping_flatrate/specificcountry_' . $i,
+                $storeId
+            );
             $allowedAreasXml = $this->_getAllowedCountries($allowSpecific, $specificCountries);
 
-            $title = Mage::getStoreConfig('google/checkout_shipping_flatrate/title_'.$i, $this->getQuote()->getStoreId());
-            $price = Mage::getStoreConfig('google/checkout_shipping_flatrate/price_'.$i, $this->getQuote()->getStoreId());
-            $price = number_format($price, 2, '.','');
-            $price = (float) Mage::helper('tax')->getShippingPrice($price, false, false);
-
             if (empty($title) || $price <= 0) {
                 continue;
             }
@@ -384,21 +580,29 @@ protected function _getFlatRateShippingXml()
                 </{$nodeName}>
 EOT;
         }
+
         $this->_shippingCalculated = true;
+
         return $xml;
     }
 
+    /**
+     * Generate shipping allowed countries XML
+     *
+     * @param boolean $allowSpecific
+     * @param string $specific
+     * @return string
+     */
     protected function _getAllowedCountries($allowSpecific, $specific)
     {
         $xml = '';
         if ($allowSpecific == 1) {
-            if($specific) {
+            if ($specific) {
                 foreach (explode(',', $specific) as $country) {
                     $xml .= "<postal-area><country-code>{$country}</country-code></postal-area>\n";
                 }
             }
         }
-
         if ($xml) {
             return $xml;
         }
@@ -406,44 +610,61 @@ protected function _getAllowedCountries($allowSpecific, $specific)
         return '<world-area />';
     }
 
+    /**
+     * Retrieve merchant calculated shipping carriers rates XML
+     *
+     * @return string
+     */
     protected function _getMerchantCalculatedShippingXml()
     {
         /*
-        we want to send ONLY ONE shipping option to google
-        */
+         * Prevent sending more then one shipping option to Google
+         */
         if ($this->_shippingCalculated) {
             return '';
         }
 
-        $active = Mage::getStoreConfigFlag('google/checkout_shipping_merchant/active', $this->getQuote()->getStoreId());
-        $methods = Mage::getStoreConfig('google/checkout_shipping_merchant/allowed_methods', $this->getQuote()->getStoreId());
+        $storeId = $this->getQuote()->getStoreId();
+        $active = Mage::getStoreConfigFlag(
+            Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_MERCHANT_ACTIVE,
+            $storeId
+        );
+        $methods = Mage::getStoreConfig(
+            Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_MERCHANT_ALLOWED_METHODS,
+            $storeId
+        );
 
         if (!$active || !$methods) {
             return '';
         }
 
-        $methods = unserialize($methods);
+        $xml           = '';
+        $methods       = unserialize($methods);
+        $taxHelper     = Mage::helper('tax');
+        $shippingModel = Mage::getModel('shipping/shipping');
 
-        $xml = '';
-        foreach ($methods['method'] as $i=>$method) {
+        foreach ($methods['method'] as $i => $method) {
             if (!$i || !$method) {
                 continue;
             }
             list($carrierCode, $methodCode) = explode('/', $method);
             if ($carrierCode) {
-                $carrier = Mage::getModel('shipping/shipping')->getCarrierByCode($carrierCode);
+                $carrier = $shippingModel->getCarrierByCode($carrierCode);
                 if ($carrier) {
                     $allowedMethods = $carrier->getAllowedMethods();
 
                     if (isset($allowedMethods[$methodCode])) {
-                        $method = Mage::getStoreConfig('carriers/'.$carrierCode.'/title', $this->getQuote()->getStoreId());
+                        $method = Mage::getStoreConfig('carriers/' . $carrierCode . '/title', $storeId);
                         $method .= ' - '.$allowedMethods[$methodCode];
                     }
 
                     $defaultPrice = (float) $methods['price'][$i];
-                    $defaultPrice = Mage::helper('tax')->getShippingPrice($defaultPrice, false, false);
+                    $defaultPrice = $taxHelper->getShippingPrice($defaultPrice, false, false);
 
-                    $allowedAreasXml = $this->_getAllowedCountries($carrier->getConfigData('sallowspecific'), $carrier->getConfigData('specificcountry'));
+                    $allowedAreasXml = $this->_getAllowedCountries(
+                        $carrier->getConfigData('sallowspecific'),
+                        $carrier->getConfigData('specificcountry')
+                    );
 
                     $xml .= <<<EOT
                         <merchant-calculated-shipping name="{$method}">
@@ -459,17 +680,24 @@ protected function _getMerchantCalculatedShippingXml()
             }
         }
         $this->_shippingCalculated = true;
+
         return $xml;
     }
 
+    /**
+     * Retrieve pickup XML
+     *
+     * @return string
+     */
     protected function _getPickupXml()
     {
-        if (!Mage::getStoreConfig('google/checkout_shipping_pickup/active', $this->getQuote()->getStoreId())) {
+        $storeId = $this->getQuote()->getStoreId();
+        if (!Mage::getStoreConfig(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_PICKUP_ACTIVE, $storeId)) {
             return '';
         }
 
-        $title = Mage::getStoreConfig('google/checkout_shipping_pickup/title', $this->getQuote()->getStoreId());
-        $price = Mage::getStoreConfig('google/checkout_shipping_pickup/price', $this->getQuote()->getStoreId());
+        $title = Mage::getStoreConfig(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_PICKUP_TITLE, $storeId);
+        $price = Mage::getStoreConfig(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_PICKUP_PRICE, $storeId);
         $price = (float) Mage::helper('tax')->getShippingPrice($price, false, false);
 
         $xml = <<<EOT
@@ -477,27 +705,34 @@ protected function _getPickupXml()
                     <price currency="{$this->getCurrency()}">{$price}</price>
                 </pickup>
 EOT;
+
         return $xml;
     }
 
+    /**
+     * Retrieve specific tax table XML
+     *
+     * @param array|float $rules
+     * @param string $type
+     * @return string
+     */
     protected function _getTaxTableXml($rules, $type)
     {
         $xml = '';
         if (is_array($rules)) {
-            foreach ($rules as $group=>$taxRates) {
+            foreach ($rules as $group => $taxRates) {
                 if ($type != 'default') {
-                    $nameAttribute = "name=\"{$group}\"";
+                    $nameAttribute       = "name=\"{$group}\"";
                     $standaloneAttribute = "standalone=\"true\"";
-                    $rulesTag = "{$type}-tax-rules";
-                    $shippingTaxed = false;
+                    $rulesTag            = "{$type}-tax-rules";
+                    $shippingTaxed       = false;
                 } else {
-                    $nameAttribute = '';
+                    $nameAttribute       = '';
                     $standaloneAttribute = '';
-                    $rulesTag = "tax-rules";
-                    $shippingTaxed = true;
+                    $rulesTag            = 'tax-rules';
+                    $shippingTaxed       = true;
                 }
 
-
                 $xml .= <<<EOT
                         <{$type}-tax-table {$nameAttribute} {$standaloneAttribute}>
                             <{$rulesTag}>
@@ -509,7 +744,7 @@ protected function _getTaxTableXml($rules, $type)
                                         <tax-area>
 
 EOT;
-                        if ($rate['country']==='US') {
+                        if ($rate['country'] === Mage_Usa_Model_Shipping_Carrier_Abstract::USA_COUNTRY_ID) {
                             if (!empty($rate['postcode']) && $rate['postcode']!=='*') {
                                 $xml .= <<<EOT
                                             <us-zip-area>
@@ -517,7 +752,7 @@ protected function _getTaxTableXml($rules, $type)
                                             </us-zip-area>
 
 EOT;
-                            } elseif (!empty($rate['state'])) {
+                            } else if (!empty($rate['state'])) {
                                 $xml .= <<<EOT
                                             <us-state-area>
                                                 <state>{$rate['state']}</state>
@@ -569,9 +804,9 @@ protected function _getTaxTableXml($rules, $type)
                                     </tax-area>
                                     <rate>{$taxRate}</rate>
 EOT;
-                        if ($shippingTaxed) {
-                            $xml .= '<shipping-taxed>true</shipping-taxed>';
-                        }
+                    if ($shippingTaxed) {
+                        $xml .= '<shipping-taxed>true</shipping-taxed>';
+                    }
                     $xml .= "</{$type}-tax-rule>";
                 }
 
@@ -582,8 +817,7 @@ protected function _getTaxTableXml($rules, $type)
             }
         } else {
             if (is_numeric($rules)) {
-                $taxRate = $rules/100;
-
+                $taxRate = $rules / 100;
                 $xml .= <<<EOT
                         <{$type}-tax-table>
                             <tax-rules>
@@ -603,13 +837,21 @@ protected function _getTaxTableXml($rules, $type)
         return $xml;
     }
 
+    /**
+     * Generate all tax tables XML
+     *
+     * @return string
+     */
     protected function _getAllTaxTablesXml()
     {
-        if (Mage::getStoreConfigFlag('google/checkout/disable_default_tax_tables', $this->getQuote()->getStoreId())) {
+        $isDefaultTaxTablesDisabled = Mage::getStoreConfigFlag(
+            Mage_GoogleCheckout_Helper_Data::XML_PATH_DISABLE_DEFAULT_TAX_TABLES,
+            $this->getQuote()->getStoreId()
+        );
+        if ($isDefaultTaxTablesDisabled) {
             return '<tax-tables merchant-calculated="true" />';
         }
 
-
         $xml = <<<EOT
             <tax-tables merchant-calculated="true">
                 {$this->_getTaxTableXml($this->_getShippingTaxRules(), 'default')}
@@ -639,54 +881,90 @@ protected function _getAllTaxTablesXml()
         return $xml;
     }
 
+    /**
+     * Retrieve customer tax class id
+     *
+     * @return int
+     */
     protected function _getCustomerTaxClass()
     {
         $customerGroup = $this->getQuote()->getCustomerGroupId();
         if (!$customerGroup) {
-            $customerGroup = Mage::getStoreConfig('customer/create_account/default_group', $this->getQuote()->getStoreId());
+            $customerGroup = Mage::getStoreConfig(
+                Mage_Customer_Model_Group::XML_PATH_DEFAULT_ID,
+                $this->getQuote()->getStoreId()
+            );
         }
         return Mage::getModel('customer/group')->load($customerGroup)->getTaxClassId();
     }
 
+    /**
+     * Retrieve shipping tax rules
+     *
+     * @return array
+     */
     protected function _getShippingTaxRules()
     {
         $customerTaxClass = $this->_getCustomerTaxClass();
-        if ($shippingTaxClass = Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_SHIPPING_TAX_CLASS, $this->getQuote()->getStoreId())) {
+        $shippingTaxClass = Mage::getStoreConfig(
+            Mage_Tax_Model_Config::CONFIG_XML_PATH_SHIPPING_TAX_CLASS,
+            $this->getQuote()->getStoreId()
+        );
+        $taxCalculationModel = Mage::getSingleton('tax/calculation');
+
+        if ($shippingTaxClass) {
             if (Mage::helper('tax')->getTaxBasedOn() == 'origin') {
-                $request = Mage::getSingleton('tax/calculation')->getRateRequest();
+                $request = $taxCalculationModel->getRateRequest();
                 $request
                     ->setCustomerClassId($customerTaxClass)
                     ->setProductClassId($shippingTaxClass);
 
-                return Mage::getSingleton('tax/calculation')->getRate($request);
+                return $taxCalculationModel->getRate($request);
             }
-            $customerRules = Mage::getSingleton('tax/calculation')->getRatesByCustomerAndProductTaxClasses($customerTaxClass, $shippingTaxClass);
+            $customerRules = $taxCalculationModel->getRatesByCustomerAndProductTaxClasses(
+                $customerTaxClass,
+                $shippingTaxClass
+            );
             $rules = array();
             foreach ($customerRules as $rule) {
                 $rules[$rule['product_class']][] = $rule;
             }
+
             return $rules;
-        } else {
-            return array();
         }
+
+        return array();
     }
 
+    /**
+     * Retrieve yax rules
+     *
+     * @return array
+     */
     protected function _getTaxRules()
     {
-        $customerTaxClass = $this->_getCustomerTaxClass();
+        $customerTaxClass    = $this->_getCustomerTaxClass();
+        $taxCalculationModel = Mage::getSingleton('tax/calculation');
+
         if (Mage::helper('tax')->getTaxBasedOn() == 'origin') {
-            $request = Mage::getSingleton('tax/calculation')->getRateRequest();
-            return Mage::getSingleton('tax/calculation')->getRatesForAllProductTaxClasses($request->setCustomerClassId($customerTaxClass));
-        } else {
-            $customerRules = Mage::getSingleton('tax/calculation')->getRatesByCustomerTaxClass($customerTaxClass);
-            $rules = array();
-            foreach ($customerRules as $rule) {
-                $rules[$rule['product_class']][] = $rule;
-            }
-            return $rules;
+            $request = $taxCalculationModel->getRateRequest()->setCustomerClassId($customerTaxClass);
+            return $taxCalculationModel->getRatesForAllProductTaxClasses($request);
         }
+
+        $customerRules = $taxCalculationModel->getRatesByCustomerTaxClass($customerTaxClass);
+        $rules = array();
+        foreach ($customerRules as $rule) {
+            $rules[$rule['product_class']][] = $rule;
+        }
+
+        return $rules;
     }
 
+    /**
+     * Getter for request initial auth details flag XML
+     *
+     * @return string
+     */
     protected function _getRequestInitialAuthDetailsXml()
     {
         $xml = <<<EOT
@@ -695,6 +973,11 @@ protected function _getRequestInitialAuthDetailsXml()
         return $xml;
     }
 
+    /**
+     * Getter for parametrized url XML
+     *
+     * @return string
+     */
     protected function _getParameterizedUrlsXml()
     {
         return '';
@@ -706,6 +989,11 @@ protected function _getParameterizedUrlsXml()
         return $xml;
     }
 
+    /**
+     * Getter for platform Id XML
+     *
+     * @return string
+     */
     protected function _getPlatformIdXml()
     {
         $xml = <<<EOT
@@ -714,6 +1002,11 @@ protected function _getPlatformIdXml()
         return $xml;
     }
 
+    /**
+     * Retrieve analytics data XML
+     *
+     * @return string
+     */
     protected function _getAnalyticsDataXml()
     {
         if (!($analytics = $this->getApi()->getAnalyticsData())) {
@@ -725,40 +1018,118 @@ protected function _getAnalyticsDataXml()
         return $xml;
     }
 
+    /**
+     * Getter for cart edit url
+     *
+     * @return string
+     */
     protected function _getEditCartUrl()
     {
         return Mage::getUrl('googlecheckout/redirect/cart');
     }
 
+    /**
+     * Getter for continue shopping url
+     *
+     * @return string
+     */
     protected function _getContinueShoppingUrl()
     {
         return Mage::getUrl('googlecheckout/redirect/continue');
     }
 
+    /**
+     * Getter for notifications url
+     *
+     * @return string
+     */
     protected function _getNotificationsUrl()
     {
         return $this->_getCallbackUrl();
     }
 
+    /**
+     * Getter for calculations url
+     *
+     * @return string
+     */
     protected function _getCalculationsUrl()
     {
         return $this->_getCallbackUrl();
     }
 
+    /**
+     * Getter for parametrized url
+     *
+     * @return string
+     */
     protected function _getParameterizedUrl()
     {
         return Mage::getUrl('googlecheckout/api/beacon');
     }
 
+    /**
+     * Define if current quote is virtual
+     *
+     * @return bool
+     */
     protected function _isOrderVirtual()
     {
-        $orderIsVirual = true;
         foreach ($this->getQuote()->getAllItems() as $item) {
             if (!$item->getIsVirtual()) {
-                $orderIsVirual = false;
-                break;
+                return false;
             }
         }
-        return $orderIsVirual;
+        return true;
+    }
+
+   /**
+    * Retrieve native carriers to Google carriers map
+    *
+    * @return array
+    */
+    protected function _getGoogleCarriersMap() {
+        return array(
+            'ups' => array(
+                'googleCarrierCompany' => 'UPS',
+                'methods' => array(
+                    'GND' => Mage::helper('usa')->__('Ground'),
+                    '1DA' => Mage::helper('usa')->__('Next Day Air'),
+                    '1DM' => Mage::helper('usa')->__('Next Day Air Early AM'),
+                    '1DP' => Mage::helper('usa')->__('Next Day Air Saver'),
+                    '2DA' => Mage::helper('usa')->__('2nd Day Air'),
+                    '2DM' => Mage::helper('usa')->__('2nd Day Air AM'),
+                    '3DS' => Mage::helper('usa')->__('3 Day Select'),
+                    '03'  => Mage::helper('usa')->__('Ground'),
+                    '01'  => Mage::helper('usa')->__('Next Day Air'),
+                    '14'  => Mage::helper('usa')->__('Next Day Air Early AM'),
+                    '13'  => Mage::helper('usa')->__('Next Day Air Saver'),
+                    '02'  => Mage::helper('usa')->__('2nd Day Air'),
+                    '59'  => Mage::helper('usa')->__('2nd Day Air AM'),
+                    '12'  => Mage::helper('usa')->__('3 Day Select')
+                )
+            ),
+            'usps' => array(
+                'googleCarrierCompany' => 'USPS',
+                'methods' => array(
+                    'Express Mail'  => Mage::helper('usa')->__('Express Mail'),
+                    'Priority Mail' => Mage::helper('usa')->__('Priority Mail'),
+                    'Parcel Post'   => Mage::helper('usa')->__('Parcel Post'),
+                    'Media Mail'    => Mage::helper('usa')->__('Media Mail')
+                )
+            ),
+            'fedex' => array(
+                'googleCarrierCompany' => 'FedEx',
+                'methods' => array(
+                    'FEDEXGROUND'        => Mage::helper('usa')->__('Ground'),
+                    'GROUNDHOMEDELIVERY' => Mage::helper('usa')->__('Home Delivery'),
+                    'FEDEXEXPRESSSAVER'  => Mage::helper('usa')->__('Express Saver'),
+                    'FIRSTOVERNIGHT'     => Mage::helper('usa')->__('First Overnight'),
+                    'PRIORITYOVERNIGHT'  => Mage::helper('usa')->__('Priority Overnight'),
+                    'STANDARDOVERNIGHT'  => Mage::helper('usa')->__('Standard Overnight'),
+                    'FEDEX2DAY'          => Mage::helper('usa')->__('2Day')
+                )
+            )
+        );
     }
 }
diff --git a/app/code/core/Mage/GoogleCheckout/etc/wsi.xml b/app/code/core/Mage/GoogleCheckout/etc/wsi.xml
new file mode 100644
index 0000000000..8c8f83ce66
--- /dev/null
+++ b/app/code/core/Mage/GoogleCheckout/etc/wsi.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:typens="urn:{{var wsdl.name}}"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+             name="{{var wsdl.name}}"
+             targetNamespace="urn:{{var wsdl.name}}">
+    <wsdl:types>
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:{{var wsdl.name}}">
+            <xsd:complexType name="catalogProductReturnEntity">
+                <xsd:sequence>
+                    <xsd:element name="enable_googlecheckout" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+        </xsd:schema>
+    </wsdl:types>
+</wsdl:definitions>
diff --git a/app/code/core/Mage/ImportExport/Helper/Data.php b/app/code/core/Mage/ImportExport/Helper/Data.php
index 7468011bde..3cce83ae0d 100644
--- a/app/code/core/Mage/ImportExport/Helper/Data.php
+++ b/app/code/core/Mage/ImportExport/Helper/Data.php
@@ -33,6 +33,8 @@
  */
 class Mage_ImportExport_Helper_Data extends Mage_Core_Helper_Data
 {
+    const XML_PATH_EXPORT_LOCAL_VALID_PATH = 'general/file/importexport_local_valid_paths';
+
     /**
      * Maximum size of uploaded files.
      *
@@ -42,4 +44,15 @@ public function getMaxUploadSize()
     {
         return min(ini_get('post_max_size'), ini_get('upload_max_filesize'));
     }
+
+    /**
+     * Get valid path masks to files for importing/exporting
+     *
+     * @return array
+     */
+    public function getLocalValidPaths()
+    {
+        $paths = Mage::getStoreConfig(self::XML_PATH_EXPORT_LOCAL_VALID_PATH);
+        return $paths;
+    }
 }
diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Giftcard.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Giftcard.php
deleted file mode 100644
index 55f9c9391f..0000000000
--- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Giftcard.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Mage
- * @package     Mage_ImportExport
- * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
- 
-/**
- * Export entity product type gift card model
- *
- * @category    Mage
- * @package     Mage_ImportExport
- * @author      Magento Core Team <core@magentocommerce.com>
- */
-class Mage_ImportExport_Model_Export_Entity_Product_Type_Giftcard
-    extends Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract
-{
-    /**
-     * Overriden attributes parameters.
-     *
-     * @var array
-     */
-    protected $_attributeOverrides = array(
-        'allow_message'             => array('source_model' => 'eav/entity_attribute_source_boolean'),
-        'is_redeemable'             => array('source_model' => 'eav/entity_attribute_source_boolean'),
-        'use_config_allow_message'  => array('source_model' => 'eav/entity_attribute_source_boolean'),
-        'use_config_email_template' => array('source_model' => 'eav/entity_attribute_source_boolean'),
-        'use_config_is_redeemable'  => array('source_model' => 'eav/entity_attribute_source_boolean'),
-        'use_config_lifetime'       => array('source_model' => 'eav/entity_attribute_source_boolean'),
-        'email_template'            => array('options_method' => 'getEmailTemplates')
-    );
-
-    /**
-     * Array of attributes codes which are disabled for export.
-     *
-     * @var array
-     */
-    protected $_disabledAttrs = array('giftcard_amounts');
-
-    /**
-     * Attributes with index (not label) value.
-     *
-     * @var array
-     */
-    protected $_indexValueAttributes = array('allow_open_amount', 'giftcard_type');
-
-    /**
-     * Return email template select options.
-     *
-     * @return array
-     */
-    public function getEmailTemplates()
-    {
-        return Mage::getModel(
-            Mage::getConfig()->getBlockClassName('enterprise_giftcard/adminhtml_catalog_product_edit_tab_giftcard')
-        )->getEmailTemplates();
-    }
-
-    /**
-     * Additional check for model availability. If method returns FALSE - model is not suitable for data processing.
-     *
-     * @return bool
-     */
-    public function isSuitable()
-    {
-        $moduleNode = Mage::getConfig()->getNode('modules/Enterprise_GiftCard/active');
-
-        return $moduleNode && 'true' == (string) $moduleNode;
-    }
-}
diff --git a/app/code/core/Mage/ImportExport/Model/Import.php b/app/code/core/Mage/ImportExport/Model/Import.php
index a9f282759e..ba2781b745 100644
--- a/app/code/core/Mage/ImportExport/Model/Import.php
+++ b/app/code/core/Mage/ImportExport/Model/Import.php
@@ -343,7 +343,7 @@ public function expandSource()
     public function uploadSource()
     {
         $entity    = $this->getEntity();
-        $uploader  = new Varien_File_Uploader(self::FIELD_NAME_SOURCE_FILE);
+        $uploader  = new Mage_Core_Model_File_Uploader(self::FIELD_NAME_SOURCE_FILE);
         $result    = $uploader->save(self::getWorkingDir());
         $extension = pathinfo($result['file'], PATHINFO_EXTENSION);
 
@@ -358,6 +358,10 @@ public function uploadSource()
         }
         $sourceFile .= '.' . $extension;
 
+        if (file_exists($sourceFile)) {
+            unlink($sourceFile);
+        }
+
         if (!@rename($result['path'] . $result['file'], $sourceFile)) {
             Mage::throwException(Mage::helper('importexport')->__('Source file moving failed'));
         }
diff --git a/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php b/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php
index abd3594bd9..c0518bbe5e 100644
--- a/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php
+++ b/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php
@@ -81,7 +81,7 @@ final public function __construct($source)
             Mage::throwException(Mage::helper('importexport')->__('Source file path must be a string'));
         }
         if (!is_readable($source)) {
-            Mage::throwException($this->__("%s file does not exists or is not readable", $source));
+            Mage::throwException(Mage::helper('importexport')->__("%s file does not exists or is not readable", $source));
         }
         $this->_source = $source;
 
diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php
index 8a07786c7a..5fb61b3561 100644
--- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php
+++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php
@@ -274,7 +274,8 @@ protected function _importData()
      */
     protected function _initAttributes()
     {
-        foreach (Mage::getResourceModel('customer/attribute_collection')->addSystemHiddenFilter() as $attribute) {
+        $collection = Mage::getResourceModel('customer/attribute_collection')->addSystemHiddenFilterWithPasswordHash();
+        foreach ($collection as $attribute) {
             $this->_attributes[$attribute->getAttributeCode()] = array(
                 'id'          => $attribute->getId(),
                 'is_required' => $attribute->getIsRequired(),
diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Giftcard.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Giftcard.php
deleted file mode 100644
index 7025cf7f96..0000000000
--- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Giftcard.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Mage
- * @package     Mage_ImportExport
- * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
- 
-/**
- * Import entity gift card product type model
- *
- * @category    Mage
- * @package     Mage_ImportExport
- * @author      Magento Core Team <core@magentocommerce.com>
- */
-class Mage_ImportExport_Model_Import_Entity_Product_Type_Giftcard
-    extends Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract
-{
-    /**
-     * Error codes.
-     */
-    const ERROR_INVALID_GIFTCARD_AMOUNT_WEBSITE = 'invalidGiftcardAmountWebsite';
-    const ERROR_INVALID_GIFTCARD_AMOUNT         = 'invalidGiftcardAmount';
-
-    /**
-     * Attributes' codes which will be allowed anyway, independently from its visibility propertie.
-     *
-     * @var array
-     */
-    protected $_forcedAttributesCodes = array(
-        'allow_message', 'email_template', 'giftcard_type', 'is_redeemable', 'lifetime',
-        'use_config_allow_message', 'use_config_email_template', 'use_config_is_redeemable', 'use_config_lifetime'
-    );
-
-    /**
-     * Attributes with index (not label) value.
-     *
-     * @var array
-     */
-    protected $_indexValueAttributes = array('allow_open_amount', 'giftcard_type');
-
-    /**
-     * Validation failure message template definitions
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::ERROR_INVALID_GIFTCARD_AMOUNT_WEBSITE => 'Invalid value for GiftCard amount website',
-        self::ERROR_INVALID_GIFTCARD_AMOUNT         => 'Invalid GiftCard amount'
-    );
-
-    /**
-     * Column names that holds values with particular meaning.
-     *
-     * @var array
-     */
-    protected $_particularAttributes = array('_giftcard_amounts_website', '_giftcard_amounts_amount');
-
-    /**
-     * Validate particular attributes columns.
-     *
-     * @param array $rowData
-     * @param int $rowNum
-     * @return bool
-     */
-    protected function _isParticularAttributesValid(array $rowData, $rowNum)
-    {
-        if (!empty($rowData['_giftcard_amounts_website'])) {
-            $websiteCode  = $rowData['_giftcard_amounts_website'];
-            $websiteCodes = $this->_entityModel->getWebsiteCodes();
-
-            if (Mage_ImportExport_Model_Import_Entity_Product::VALUE_ALL != $websiteCode
-                    && !isset($websiteCodes[$websiteCode])) {
-                $this->_entityModel->addRowError(self::ERROR_INVALID_GIFTCARD_AMOUNT_WEBSITE, $rowNum);
-                return false;
-            }
-            if (!isset($rowData['_giftcard_amounts_amount']) || $rowData['_giftcard_amounts_amount'] < 0) {
-                $this->_entityModel->addRowError(self::ERROR_INVALID_GIFTCARD_AMOUNT, $rowNum);
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Additional check for model availability. If method returns FALSE - model is not suitable for data processing.
-     *
-     * @return bool
-     */
-    public function isSuitable()
-    {
-        $moduleNode = Mage::getConfig()->getNode('modules/Enterprise_GiftCard/active');
-
-        return $moduleNode && 'true' == (string) $moduleNode;
-    }
-
-    /**
-     * Save product type specific data.
-     *
-     * @return Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract
-     */
-    public function saveData()
-    {
-        $connection    = Mage::getSingleton('core/resource')->getConnection('write');
-        $table         = Mage::getSingleton('core/resource')->getTableName('enterprise_giftcard/amount');
-        $newSku        = $this->_entityModel->getNewSku();
-        $entityTypeId  = $this->_entityModel->getEntityTypeId();
-        $websiteCodes  = $this->_entityModel->getWebsiteCodes();
-        $priceIsGlobal = Mage::helper('catalog')->isPriceGlobal();
-
-        while ($bunch = $this->_entityModel->getNextBunch()) {
-            $amountData = array(
-                'product_id' => array(),
-                'amounts'    => array()
-            );
-            foreach ($bunch as $rowNum => $rowData) {
-                if (!$this->_entityModel->isRowAllowedToImport($rowData, $rowNum)
-                    || empty($rowData['_giftcard_amounts_website'])
-                ) {
-                    continue;
-                }
-                $scope = $this->_entityModel->getRowScope($rowData);
-                if (Mage_ImportExport_Model_Import_Entity_Product::SCOPE_DEFAULT == $scope) {
-                    $productData = $newSku[$rowData[Mage_ImportExport_Model_Import_Entity_Product::COL_SKU]];
-                } else {
-                    $collAttrSet = Mage_ImportExport_Model_Import_Entity_Product::COL_ATTR_SET;
-                    $rowData[$collAttrSet] = $productData['attr_set_code'];
-                    $rowData[Mage_ImportExport_Model_Import_Entity_Product::COL_TYPE] = $productData['type_id'];
-                }
-                $productId = $productData['entity_id'];
-
-                if ($this->_type != $rowData[Mage_ImportExport_Model_Import_Entity_Product::COL_TYPE]) {
-                    continue;
-                }
-                $attributes = $this->_getProductAttributes($rowData);
-                $amountData['product_id'][$productId] = true;
-                
-                if (Mage_ImportExport_Model_Import_Entity_Product::VALUE_ALL == $rowData['_giftcard_amounts_website']
-                    || Mage::app()->isSingleStoreMode() || $priceIsGlobal) {
-                    $websiteId = 0;
-                } else {
-                    $websiteId = $websiteCodes[$rowData['_giftcard_amounts_website']];
-                }
-                $amountData['amounts'][] = array(
-                    'website_id'     => $websiteId,
-                    'value'          => $rowData['_giftcard_amounts_amount'],
-                    'entity_id'      => $productId,
-                    'entity_type_id' => $entityTypeId,
-                    'attribute_id'   => $attributes['giftcard_amounts']['id']
-                );
-            }
-            // remove old data
-            if ($amountData['product_id']) {
-                $connection->delete(
-                    $table, $connection->quoteInto('entity_id IN (?)', array_keys($amountData['product_id']))
-                );
-            }
-            // save amounts
-            if ($amountData['amounts']) {
-                $connection->insertMultiple($table, $amountData['amounts']);
-            }
-        }
-        return $this;
-    }
-}
diff --git a/app/code/core/Mage/ImportExport/etc/config.xml b/app/code/core/Mage/ImportExport/etc/config.xml
index ff69ec4ef7..c6f90ddb99 100644
--- a/app/code/core/Mage/ImportExport/etc/config.xml
+++ b/app/code/core/Mage/ImportExport/etc/config.xml
@@ -125,4 +125,18 @@
             </updates>
         </layout>
     </adminhtml>
+    <default>
+        <general>
+            <file>
+                <importexport_local_valid_paths>
+                    <available>
+                        <export_xml>var/export/*/*.xml</export_xml>
+                        <export_csv>var/export/*/*.csv</export_csv>
+                        <import_xml>var/import/*/*.xml</import_xml>
+                        <import_csv>var/import/*/*.csv</import_csv>
+                    </available>
+                </importexport_local_valid_paths>
+            </file>
+        </general>
+    </default>
 </config>
diff --git a/app/code/core/Mage/Index/Model/Indexer.php b/app/code/core/Mage/Index/Model/Indexer.php
index 0cefcd0973..ee9cc0d70d 100644
--- a/app/code/core/Mage/Index/Model/Indexer.php
+++ b/app/code/core/Mage/Index/Model/Indexer.php
@@ -213,7 +213,7 @@ public function processEntityAction(Varien_Object $entity, $entityType, $eventTy
         }
         $event = $this->logEvent($entity, $entityType, $eventType, false);
         /**
-         * Index and save event just in case if some process mutched it
+         * Index and save event just in case if some process matched it
          */
         if ($event->getProcessIds()) {
             $this->indexEvent($event);
diff --git a/app/code/core/Mage/Index/etc/config.xml b/app/code/core/Mage/Index/etc/config.xml
index af5ff41cf9..5c0a93ebdc 100644
--- a/app/code/core/Mage/Index/etc/config.xml
+++ b/app/code/core/Mage/Index/etc/config.xml
@@ -141,5 +141,14 @@
                 </index>
             </updates>
         </layout>
+        <translate>
+            <modules>
+                <Mage_Index>
+                    <files>
+                        <default>Mage_Index.csv</default>
+                    </files>
+                </Mage_Index>
+            </modules>
+        </translate>
     </adminhtml>
 </config>
diff --git a/app/code/core/Mage/Install/Model/Installer/Config.php b/app/code/core/Mage/Install/Model/Installer/Config.php
index 256f59dad4..d5d4274797 100644
--- a/app/code/core/Mage/Install/Model/Installer/Config.php
+++ b/app/code/core/Mage/Install/Model/Installer/Config.php
@@ -136,7 +136,8 @@ public function getFormData()
     protected function _checkHostsInfo($data)
     {
         $url = $data['protocol'] . '://' . $data['host'] . ':' . $data['port'] . $data['base_path'];
-        $surl= $data['secure_protocol'] . '://' . $data['secure_host'] . ':' . $data['secure_port'] . $data['secure_base_path'];
+        $surl= $data['secure_protocol'] . '://' . $data['secure_host'] . ':'
+                . $data['secure_port'] . $data['secure_base_path'];
 
         $this->_checkUrl($url);
         $this->_checkUrl($surl, true);
@@ -178,7 +179,7 @@ public function replaceTmpInstallDate($date = null)
     public function replaceTmpEncryptKey($key = null)
     {
         if (!$key) {
-            $key = md5(time());
+            $key = md5(Mage::helper('core')->getRandomString(10));
         }
         $localXml = file_get_contents($this->_localConfigFile);
         $localXml = str_replace(self::TMP_ENCRYPT_KEY_VALUE, $key, $localXml);
diff --git a/app/code/core/Mage/Newsletter/Model/Problem.php b/app/code/core/Mage/Newsletter/Model/Problem.php
index 9feeef5c51..ede295eaa7 100644
--- a/app/code/core/Mage/Newsletter/Model/Problem.php
+++ b/app/code/core/Mage/Newsletter/Model/Problem.php
@@ -24,47 +24,78 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-
 /**
- * Nesletter problem model
+ * Newsletter problem model
  *
  * @category   Mage
  * @package    Mage_Newsletter
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Mage_Newsletter_Model_Problem extends Mage_Core_Model_Abstract
 {
-
+    /**
+     * Current Subscriber
+     * 
+     * @var Mage_Newsletter_Model_Subscriber
+     */
     protected  $_subscriber = null;
 
+    /**
+     * Initialize Newsletter Problem Model
+     */
     protected function _construct()
     {
         $this->_init('newsletter/problem');
     }
 
+    /**
+     * Add Subscriber Data
+     *
+     * @param Mage_Newsletter_Model_Subscriber $subscriber
+     * @return Mage_Newsletter_Model_Problem
+     */
     public function addSubscriberData(Mage_Newsletter_Model_Subscriber $subscriber)
     {
         $this->setSubscriberId($subscriber->getId());
+        return $this;
     }
 
+    /**
+     * Add Queue Data
+     *
+     * @param Mage_Newsletter_Model_Queue $queue
+     * @return Mage_Newsletter_Model_Problem
+     */
     public function addQueueData(Mage_Newsletter_Model_Queue $queue)
     {
         $this->setQueueId($queue->getId());
+        return $this;
     }
 
+    /**
+     * Add Error Data
+     *
+     * @param Exception $e
+     * @return Mage_Newsletter_Model_Problem
+     */
     public function addErrorData(Exception $e)
     {
         $this->setProblemErrorCode($e->getCode());
         $this->setProblemErrorText($e->getMessage());
+        return $this;
     }
 
+    /**
+     * Retrieve Subscriber
+     *
+     * @return Mage_Newsletter_Model_Subscriber
+     */
     public function getSubscriber()
     {
         if(!$this->getSubscriberId()) {
             return null;
         }
 
-
         if(is_null($this->_subscriber)) {
             $this->_subscriber = Mage::getModel('newsletter/subscriber')
                 ->load($this->getSubscriberId());
@@ -73,6 +104,11 @@ public function getSubscriber()
         return $this->_subscriber;
     }
 
+    /**
+     * Unsubscribe Subscriber
+     *
+     * @return Mage_Newsletter_Model_Problem
+     */
     public function unsubscribe()
     {
         if($this->getSubscriber()) {
@@ -80,6 +116,7 @@ public function unsubscribe()
                 ->setIsStatusChanged(true)
                 ->save();
         }
+        return $this;
     }
 
 }
diff --git a/app/code/core/Mage/Newsletter/Model/Queue.php b/app/code/core/Mage/Newsletter/Model/Queue.php
index 84cb0d4abe..7486bf4d3d 100644
--- a/app/code/core/Mage/Newsletter/Model/Queue.php
+++ b/app/code/core/Mage/Newsletter/Model/Queue.php
@@ -182,18 +182,18 @@ public function sendPerSubscriber($count=20, array $additionalVariables=array())
             $name = $item->getSubscriberFullName();
 
             $sender->emulateDesign($item->getStoreId());
-            $successSend = $sender->send($email, $name, array('subscriber'=>$item));
+            $successSend = $sender->send($email, $name, array('subscriber' => $item));
             $sender->revertDesign();
-            
+
             if($successSend) {
                 $item->received($this);
             } else {
                 $problem = Mage::getModel('newsletter/problem');
+                $notification = Mage::helper('newsletter')->__('Please refer to exeption.log');
                 $problem->addSubscriberData($item)
-                    ->addQueueData($queue)
-                    ->addErrorData('Please refer to exeption.log')
+                    ->addQueueData($this)
+                    ->addErrorData(new Exception($notification))
                     ->save();
-
                 $item->received($this);
             }
         }
diff --git a/app/code/core/Mage/Page/etc/config.xml b/app/code/core/Mage/Page/etc/config.xml
index 63a410cb69..9c093da008 100644
--- a/app/code/core/Mage/Page/etc/config.xml
+++ b/app/code/core/Mage/Page/etc/config.xml
@@ -132,5 +132,12 @@
                 <copyright>&amp;copy; 2008 Magento Demo Store. All Rights Reserved.</copyright>
             </footer>
         </design>
+        <system>
+            <media_storage_configuration>
+                <allowed_resources>
+                    <site_favicons>favicon</site_favicons>
+                </allowed_resources>
+            </media_storage_configuration>
+        </system>
     </default>
 </config>
diff --git a/app/code/core/Mage/PageCache/Block/Adminhtml/Cache/Additional.php b/app/code/core/Mage/PageCache/Block/Adminhtml/Cache/Additional.php
index ac36de4f7d..913ea4543a 100644
--- a/app/code/core/Mage/PageCache/Block/Adminhtml/Cache/Additional.php
+++ b/app/code/core/Mage/PageCache/Block/Adminhtml/Cache/Additional.php
@@ -50,6 +50,6 @@ public function getCleanExternalCacheUrl()
      */
     public function canShowButton()
     {
-        return Mage::helper('pagecache')->isEnabled();
+        return Mage::helper('pagecache')->isEnabled() && Mage::getSingleton('admin/session')->isAllowed('page_cache');
     }
 }
diff --git a/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php b/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php
index 637a19f7f7..830e3cda66 100644
--- a/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php
+++ b/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php
@@ -69,4 +69,14 @@ public function cleanAction()
         }
         $this->_redirect('*/cache/index');
     }
+
+    /**
+     * Check current user permission on resource and privilege
+     *
+     * @return bool
+     */
+    protected function _isAllowed()
+    {
+        return Mage::getSingleton('admin/session')->isAllowed('page_cache');
+    }
 }
diff --git a/app/code/core/Mage/PageCache/etc/adminhtml.xml b/app/code/core/Mage/PageCache/etc/adminhtml.xml
new file mode 100644
index 0000000000..5095fc0898
--- /dev/null
+++ b/app/code/core/Mage/PageCache/etc/adminhtml.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_PageCache
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<config>
+    <acl>
+        <resources>
+            <admin>
+                <children>
+                    <page_cache translate="title" module="pageCache">
+                        <title>External Page Cache</title>
+                        <sort_order>0</sort_order>
+                    </page_cache>
+                </children>
+            </admin>
+        </resources>
+    </acl>
+</config>
diff --git a/app/code/core/Mage/Paygate/etc/system.xml b/app/code/core/Mage/Paygate/etc/system.xml
index 2aad07380b..1cc578ecf5 100644
--- a/app/code/core/Mage/Paygate/etc/system.xml
+++ b/app/code/core/Mage/Paygate/etc/system.xml
@@ -238,7 +238,7 @@
                             <depends><centinel>1</centinel></depends>
                         </centinel_is_mode_strict>
                         <centinel_api_url translate="label comment">
-                            <label>Centinel Api URL</label>
+                            <label>Centinel API URL</label>
                             <comment>If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.</comment>
                             <frontend_type>text</frontend_type>
                             <source_model>adminhtml/system_config_source_yesno</source_model>
diff --git a/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-data-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-data-upgrade-0.7.0-0.7.1.php
new file mode 100644
index 0000000000..ff45feb05f
--- /dev/null
+++ b/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-data-upgrade-0.7.0-0.7.1.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Paygate
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+$installer = $this;
+/* @var $installer Mage_Core_Model_Resource_Setup */
+$installer->startSetup();
+$connection = $installer->getConnection();
+$connection->beginTransaction();
+
+try{
+    $paymentMethodCode = 'authorizenet';
+    $transactionTable = $installer->getTable('sales/payment_transaction');
+    $paymentTable = $installer->getTable('sales/order_payment');
+
+    /**
+     * Update payments
+     */
+    $payments = $connection->fetchAll(
+        $connection->select()
+            ->from($paymentTable)
+            ->joinLeft(
+            $transactionTable,
+            "$transactionTable.txn_id = $paymentTable.last_trans_id",
+               array(
+                   'last_transaction_id' => 'transaction_id',
+                   'last_transaction_type' => 'txn_type',
+                   'last_transaction_is_closed' => 'is_closed'
+               )
+            )
+            ->where('method=?', $paymentMethodCode)
+    );
+
+    $paymentsIds = array();
+    $transactionsShouldBeOpened = array();
+    foreach ($payments as $payment) {
+        $paymentId = $payment['entity_id'];
+        $card = array(
+            'last_trans_id' => $payment['last_trans_id'],
+            'cc_type' => $payment['cc_type'],
+            'cc_owner' => $payment['cc_owner'],
+            'cc_last4' => $payment['cc_last4'],
+            'cc_exp_month' => $payment['cc_exp_month'],
+            'cc_exp_year' => $payment['cc_exp_year'],
+            'cc_ss_issue' => $payment['cc_ss_issue'],
+            'cc_ss_start_month' => $payment['cc_ss_start_month'],
+            'cc_ss_start_year' => $payment['cc_ss_start_year'],
+            'requested_amount' => $payment['base_amount_ordered'],
+            'processed_amount' => $payment['base_amount_ordered'],
+            'captured_amount' => $payment['base_amount_paid_online'],
+            'refunded_amount' => $payment['base_amount_refunded_online']
+        );
+        $additionalInformation = unserialize($payment['additional_information']);
+        if (isset ($additionalInformation['authorize_cards'])) {
+            continue;
+        }
+        $additionalInformation['authorize_cards'] = array(
+            (string) md5(microtime(1)) => $card
+        );
+        $additionalInformation = serialize($additionalInformation);
+
+        $bind  = array(
+            'additional_information' => $additionalInformation,
+            'last_trans_id' => null,
+            'cc_type' => null,
+            'cc_owner' => null,
+            'cc_last4' => null,
+            'cc_exp_month' => null,
+            'cc_exp_year' => null,
+            'cc_ss_issue' => null,
+            'cc_ss_start_month' => null,
+            'cc_ss_start_year' => null
+        );
+        $where = $this->getConnection()->quoteInto('entity_id=?', $paymentId);
+        $this->getConnection()->update($paymentTable, $bind, $where);
+
+        /**
+         * Collect information for update last transactions of updated payments
+         */
+        $paymentsIds[] = $paymentId;
+        if (($payment['last_transaction_type'] == 'authorization' || $payment['last_transaction_type'] == 'capture')
+            && $payment['last_transaction_is_closed'] == '1') {
+            $transactionsShouldBeOpened[] = $payment['last_transaction_id'];
+        }
+    }
+
+    /**
+     * Update transactions
+     */
+    $transactions = $installer->getConnection()->fetchAll(
+        $installer->getConnection()->select()
+            ->from(
+                $transactionTable,
+                array('transaction_id', 'txn_id', 'txn_type', 'is_closed', 'additional_information')
+            )
+            ->where('payment_id IN (?)', $paymentsIds)
+    );
+    foreach ($transactions as $transaction) {
+        $transactionId = $transaction['transaction_id'];
+
+        $realTransactionId = array_shift(explode('-', $transaction['txn_id']));
+        $additionalInformation = unserialize($transaction['additional_information']);
+        $additionalInformation['real_transaction_id'] = $realTransactionId;
+        $additionalInformation = serialize($additionalInformation);
+
+        $isClosed = $transaction['is_closed'];
+        if (in_array($transactionId, $transactionsShouldBeOpened)) {
+            $isClosed = '0';
+        }
+
+        $bind  = array(
+            'additional_information' => $additionalInformation,
+            'is_closed' => $isClosed
+        );
+        $where = $this->getConnection()->quoteInto('transaction_id=?', $transactionId);
+        $this->getConnection()->update($transactionTable, $bind, $where);
+    }
+
+    $installer->endSetup();
+    $connection->commit();
+} catch (Exception $e) {
+    $connection->rollback();
+    throw $e;
+}
+
diff --git a/app/code/core/Mage/Payment/Helper/Data.php b/app/code/core/Mage/Payment/Helper/Data.php
index b1ddcdb278..7095fe5fbe 100644
--- a/app/code/core/Mage/Payment/Helper/Data.php
+++ b/app/code/core/Mage/Payment/Helper/Data.php
@@ -264,4 +264,37 @@ public function getAllBillingAgreementMethods()
         }
         return $result;
     }
+
+    /**
+     * Returns value of Zero Subtotal Checkout / Enabled
+     *
+     * @param mixed $store
+     * @return boolean
+     */
+    public function isZeroSubTotal($store = null)
+    {
+        return Mage::getStoreConfig(Mage_Payment_Model_Method_Free::XML_PATH_PAYMENT_FREE_ACTIVE, $store);
+    }
+
+    /**
+     * Returns value of Zero Subtotal Checkout / New Order Status
+     *
+     * @param mixed $store
+     * @return string
+     */
+    public function getZeroSubTotalOrderStatus($store = null)
+    {
+        return Mage::getStoreConfig(Mage_Payment_Model_Method_Free::XML_PATH_PAYMENT_FREE_ORDER_STATUS, $store);
+    }
+
+    /**
+     * Returns value of Zero Subtotal Checkout / Automatically Invoice All Items
+     *
+     * @param mixed $store
+     * @return string
+     */
+    public function getZeroSubTotalPaymentAutomaticInvoice($store = null)
+    {
+        return Mage::getStoreConfig(Mage_Payment_Model_Method_Free::XML_PATH_PAYMENT_FREE_PAYMENT_ACTION, $store);
+    }
 }
diff --git a/app/code/core/Mage/Payment/Model/Method/Free.php b/app/code/core/Mage/Payment/Model/Method/Free.php
index fb7c7e1f7e..0f0ed3b60a 100644
--- a/app/code/core/Mage/Payment/Model/Method/Free.php
+++ b/app/code/core/Mage/Payment/Model/Method/Free.php
@@ -34,6 +34,12 @@
  */
 class Mage_Payment_Model_Method_Free extends Mage_Payment_Model_Method_Abstract
 {
+    /**
+     * XML Pathes for configuration constants
+     */
+    const XML_PATH_PAYMENT_FREE_ACTIVE = 'payment/free/active';
+    const XML_PATH_PAYMENT_FREE_ORDER_STATUS = 'payment/free/order_status';
+    const XML_PATH_PAYMENT_FREE_PAYMENT_ACTION = 'payment/free/payment_action';
 
     /**
      * Payment Method features
diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php
index 3cfb36ac1e..abb1ac3bae 100644
--- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php
+++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php
@@ -76,6 +76,20 @@ public function getElements()
         return $this->_elements;
     }
 
+    /**
+     * Get element by id
+     *
+     * @param string $elementId
+     * @return Varien_Data_Form_Element_Abstract
+     */
+    public function getElement($elementId)
+    {
+        if (isset($this->_elements[$elementId])) {
+            return $this->_elements[$elementId];
+        }
+        return false;
+    }
+
     /**
      * Return checkbox html with hidden field for correct config values
      *
@@ -198,4 +212,29 @@ public function getInheritElementLabelHtml(Varien_Data_Form_Element_Abstract $el
             Mage::helper('adminhtml')->__('Use Default')
         );
     }
+
+    /**
+     * Return element label with tag SPAN
+     *
+     * @param Varien_Data_Form_Element_Abstract $element
+     * @return string
+     */
+    public function getElementLabelTextHtml(Varien_Data_Form_Element_Abstract $element)
+    {
+        return sprintf('<span id="%s">%s</span>',
+            $element->getHtmlId() . '_label_text',
+            $this->escapeHtml($this->getElementLabel($element))
+        );
+    }
+
+    /**
+     * Return backend config for element like JSON
+     *
+     * @param Varien_Data_Form_Element_Abstract $element
+     * @return string
+     */
+    public function getElementBackendConfig(Varien_Data_Form_Element_Abstract $element)
+    {
+        return Mage::helper('paypal')->getElementBackendConfig($element);
+    }
 }
diff --git a/app/code/core/Mage/Paypal/Controller/Express/Abstract.php b/app/code/core/Mage/Paypal/Controller/Express/Abstract.php
index 1f71a0d617..a0cbbb1d0f 100644
--- a/app/code/core/Mage/Paypal/Controller/Express/Abstract.php
+++ b/app/code/core/Mage/Paypal/Controller/Express/Abstract.php
@@ -61,9 +61,16 @@ public function startAction()
         try {
             $this->_initCheckout();
 
+            if ($this->_getQuote()->getIsMultiShipping()) {
+                $this->_getQuote()->setIsMultiShipping(false);
+                $this->_getQuote()->removeAllAddresses();
+            }
+
             $customer = Mage::getSingleton('customer/session')->getCustomer();
             if ($customer && $customer->getId()) {
-                $this->_checkout->setCustomerWithAddressChange($customer, null, $this->_getQuote()->getShippingAddress());
+                $this->_checkout->setCustomerWithAddressChange(
+                    $customer, null, $this->_getQuote()->getShippingAddress()
+                );
             }
 
             // billing agreement
@@ -187,7 +194,9 @@ public function reviewAction()
             Mage::getSingleton('checkout/session')->addError($e->getMessage());
         }
         catch (Exception $e) {
-            Mage::getSingleton('checkout/session')->addError($this->__('Unable to initialize Express Checkout review.'));
+            Mage::getSingleton('checkout/session')->addError(
+                $this->__('Unable to initialize Express Checkout review.')
+            );
             Mage::logException($e);
         }
         $this->_redirect('checkout/cart');
@@ -326,7 +335,8 @@ protected function _initToken($setToken = null)
     {
         if (null !== $setToken) {
             if (false === $setToken) {
-                if (!$this->_getSession()->getExpressCheckoutToken()) { // security measure for avoid unsetting token twice
+                // security measure for avoid unsetting token twice
+                if (!$this->_getSession()->getExpressCheckoutToken()) {
                     Mage::throwException($this->__('PayPal Express Checkout Token does not exist.'));
                 }
                 $this->_getSession()->unsExpressCheckoutToken();
diff --git a/app/code/core/Mage/Paypal/Helper/Data.php b/app/code/core/Mage/Paypal/Helper/Data.php
index 727fcd040c..9a83955c3a 100644
--- a/app/code/core/Mage/Paypal/Helper/Data.php
+++ b/app/code/core/Mage/Paypal/Helper/Data.php
@@ -55,4 +55,25 @@ public function shouldAskToCreateBillingAgreement(Mage_Paypal_Model_Config $conf
         }
         return self::$_shouldAskToCreateBillingAgreement;
     }
+
+    /**
+     * Return backend config for element like JSON
+     *
+     * @param Varien_Data_Form_Element_Abstract $element
+     * @return string
+     */
+    public function getElementBackendConfig(Varien_Data_Form_Element_Abstract $element) {
+        $config = $element->getFieldConfig()->backend_congif;
+        if (!$config) {
+            return false;
+        }
+        $config = $config->asCanonicalArray();
+        if (isset($config['enable_for_countries'])) {
+            $config['enable_for_countries'] = explode(',', str_replace(' ', '', $config['enable_for_countries']));
+        }
+        if (isset($config['disable_for_countries'])) {
+            $config['disable_for_countries'] = explode(',', str_replace(' ', '', $config['disable_for_countries']));
+        }
+        return Mage::helper('core')->jsonEncode($config);
+    }
 }
diff --git a/app/code/core/Mage/Paypal/Model/Api/Nvp.php b/app/code/core/Mage/Paypal/Model/Api/Nvp.php
index ff30c815c0..be587b7e48 100644
--- a/app/code/core/Mage/Paypal/Model/Api/Nvp.php
+++ b/app/code/core/Mage/Paypal/Model/Api/Nvp.php
@@ -241,7 +241,7 @@ class Mage_Paypal_Model_Api_Nvp extends Mage_Paypal_Model_Api_Abstract
         'RETURNFMFDETAILS', 'SUBJECT', 'ITEMAMT', 'SHIPPINGAMT', 'TAXAMT',
     );
     protected $_doExpressCheckoutPaymentResponse = array(
-        'TRANSACTIONID', 'AMT', 'PAYMENTSTATUS', 'PENDINGREASON', 'REDIRECTREQUIRED', 'SUCCESSPAGEREDIRECTREQUESTED',
+        'TRANSACTIONID', 'AMT', 'PAYMENTSTATUS', 'PENDINGREASON', 'REDIRECTREQUIRED'
     );
 
     /**
@@ -438,7 +438,9 @@ class Mage_Paypal_Model_Api_Nvp extends Mage_Paypal_Model_Api_Abstract
      * @var array
      */
     protected $_billingAgreementCustomerDetailsRequest = array('TOKEN');
-    protected $_billingAgreementCustomerDetailsResponse = array('EMAIL', 'PAYERID', 'PAYERSTATUS', 'SHIPTOCOUNTRYCODE', 'PAYERBUSINESS');
+    protected $_billingAgreementCustomerDetailsResponse = array('EMAIL', 'PAYERID', 'PAYERSTATUS', 'SHIPTOCOUNTRYCODE',
+        'PAYERBUSINESS'
+    );
 
     /**
      * Create Billing Agreement request/response map
@@ -463,7 +465,10 @@ class Mage_Paypal_Model_Api_Nvp extends Mage_Paypal_Model_Api_Abstract
      *
      * @var array
      */
-    protected $_doReferenceTransactionRequest = array('REFERENCEID', 'PAYMENTACTION', 'AMT', 'ITEMAMT', 'SHIPPINGAMT', 'TAXAMT',);
+    protected $_doReferenceTransactionRequest = array('REFERENCEID', 'PAYMENTACTION', 'AMT', 'ITEMAMT', 'SHIPPINGAMT',
+        'TAXAMT'
+    );
+
     protected $_doReferenceTransactionResponse = array('BILLINGAGREEMENTID', 'TRANSACTIONID');
 
     /**
@@ -472,7 +477,9 @@ class Mage_Paypal_Model_Api_Nvp extends Mage_Paypal_Model_Api_Abstract
      * @var array
      */
     protected $_debugReplacePrivateDataKeys = array(
+
         'ACCT', 'EXPDATE', 'CVV2', 'CARDISSUE', 'CARDSTART', 'CREDITCARDTYPE', 'USER', 'PWD', 'SIGNATURE'
+
     );
 
     /**
@@ -490,7 +497,7 @@ class Mage_Paypal_Model_Api_Nvp extends Mage_Paypal_Model_Api_Abstract
     protected $_requiredResponseParams = array(
         self::DO_DIRECT_PAYMENT => array('ACK', 'CORRELATIONID', 'AMT')
     );
-    
+
     /**
      * Warning codes recollected after each API call
      *
@@ -921,14 +928,14 @@ public function call($methodName, array $request)
             Mage::throwException(Mage::helper('paypal')->__('Unable to communicate with the PayPal gateway.'));
         }
 
-        
+
         if (!$this->_validateResponse($methodName, $response)) {
             Mage::logException(new Exception(
                 Mage::helper('paypal')->__("PayPal response hasn't required fields.")
             ));
             Mage::throwException(Mage::helper('paypal')->__('There was an error processing your order. Please contact us or try again later.'));
         }
-        
+
         $this->_callErrors = array();
         if ($this->_isCallSuccessful($response)) {
             if ($this->_rawResponseNeeded) {
@@ -971,7 +978,8 @@ protected function _handleCallErrors($response)
         }
         if ($errors) {
             $errors = implode(' ', $errors);
-            $e = Mage::exception('Mage_Core', sprintf('PayPal NVP gateway errors: %s Correlation ID: %s. Version: %s.', $errors,
+            $e = Mage::exception('Mage_Core', sprintf('PayPal NVP gateway errors: %s Correlation ID: %s. Version: %s.',
+                $errors,
                 isset($response['CORRELATIONID']) ? $response['CORRELATIONID'] : '',
                 isset($response['VERSION']) ? $response['VERSION'] : ''
             ));
@@ -1002,25 +1010,25 @@ protected function _isCallSuccessful($response)
         }
         return false;
     }
-    
+
     /**
      * Validate response array.
-     * 
+     *
      * @param string $method
      * @param array $response
      * @return bool
      */
-    protected function _validateResponse($method, $response) 
+    protected function _validateResponse($method, $response)
     {
         if (isset($this->_requiredResponseParams[$method])) {
             foreach ($this->_requiredResponseParams[$method] as $param) {
                 if (!isset($response[$param])) {
                     return false;
-                }    
+                }
             }
         }
         return true;
-    } 
+    }
 
     /**
      * Parse an NVP response string into an associative array
diff --git a/app/code/core/Mage/Paypal/Model/Config.php b/app/code/core/Mage/Paypal/Model/Config.php
index 173f75598f..0cf10441a7 100644
--- a/app/code/core/Mage/Paypal/Model/Config.php
+++ b/app/code/core/Mage/Paypal/Model/Config.php
@@ -149,6 +149,7 @@ class Mage_Paypal_Model_Config
 
     /**
      * Current store id
+     *
      * @var int
      */
     protected $_storeId = null;
@@ -168,6 +169,7 @@ class Mage_Paypal_Model_Config
 
     /**
      * Style system config map (Express Checkout)
+     *
      * @var array
      */
     protected $_ecStyleConfigMap = array(
@@ -180,13 +182,15 @@ class Mage_Paypal_Model_Config
 
     /**
      * Currency codes supported by PayPal methods
+     *
      * @var array
      */
     protected $_supportedCurrencyCodes = array('AUD', 'CAD', 'CZK', 'DKK', 'EUR', 'HKD', 'HUF', 'ILS', 'JPY', 'MXN',
-        'NOK', 'NZD', 'PLN', 'GBP', 'SGD', 'SEK', 'CHF', 'USD');
+        'NOK', 'NZD', 'PLN', 'GBP', 'SGD', 'SEK', 'CHF', 'USD', 'TWD', 'THB');
 
     /**
      * Merchant country supported by PayPal
+     *
      * @var array
      */
     protected $_supportedCountryCodes = array(
@@ -220,6 +224,7 @@ class Mage_Paypal_Model_Config
 
     /**
      * Locale codes supported by misc images (marks, shortcuts etc)
+     *
      * @var array
      * @link https://cms.paypal.com/us/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_api_ECButtonIntegration#id089QD0O0TX4__id08AH904I0YK
      */
@@ -229,6 +234,7 @@ class Mage_Paypal_Model_Config
 
     /**
      * Set method and store id, if specified
+     *
      * @param array $params
      */
     public function __construct($params = array())
@@ -261,6 +267,7 @@ public function setMethod($method)
 
     /**
      * Payment method instance code getter
+     *
      * @return string
      */
     public function getMethodCode()
@@ -270,6 +277,7 @@ public function getMethodCode()
 
     /**
      * Store ID setter
+     *
      * @param int $storeId
      * @return Mage_Paypal_Model_Config
      */
@@ -321,7 +329,8 @@ public function isMethodAvailable($methodCode = null)
                     break;
                 }
                 // check for direct payments dependence
-                if ($this->isMethodActive(self::METHOD_WPP_DIRECT) || $this->isMethodActive(self::METHOD_WPP_PE_DIRECT)) {
+                if ($this->isMethodActive(self::METHOD_WPP_DIRECT)
+                    || $this->isMethodActive(self::METHOD_WPP_PE_DIRECT)) {
                     $result = false;
                 }
                 break;
@@ -337,7 +346,8 @@ public function isMethodAvailable($methodCode = null)
                 // check for direct payments dependence
                 if ($this->isMethodActive(self::METHOD_WPP_PE_DIRECT)) {
                     $result = true;
-                } elseif (!$this->isMethodActive(self::METHOD_WPP_PE_DIRECT) && !$this->isMethodActive(self::METHOD_PAYFLOWPRO)) {
+                } elseif (!$this->isMethodActive(self::METHOD_WPP_PE_DIRECT)
+                          && !$this->isMethodActive(self::METHOD_PAYFLOWPRO)) {
                     $result = false;
                 }
                 break;
@@ -508,6 +518,7 @@ public function getCountryMethods($countryCode = null)
 
     /**
      * Get url for dispatching customer to express checkout start
+     *
      * @param string $token
      * @return string
      */
@@ -521,6 +532,7 @@ public function getExpressCheckoutStartUrl($token)
 
     /**
      * Get url that allows to edit checkout details on paypal side
+     *
      * @param $token
      * @return string
      */
@@ -536,6 +548,7 @@ public function getExpressCheckoutEditUrl($token)
     /**
      * Get url for additional actions that PayPal may require customer to do after placing the order.
      * For instance, redirecting customer to bank for payment confirmation.
+     *
      * @param string $token
      * @return string
      */
@@ -577,6 +590,7 @@ public function getPaypalUrl(array $params = array())
 
     /**
      * Whether Express Checkout button should be rendered dynamically
+     *
      * @return bool
      */
     public function areButtonsDynamic()
@@ -781,6 +795,7 @@ public function getBuildNotationCode($countryCode = null)
 
     /**
      * Express Checkout button "flavors" source getter
+     *
      * @return array
      */
     public function getExpressCheckoutButtonFlavors()
@@ -793,6 +808,7 @@ public function getExpressCheckoutButtonFlavors()
 
     /**
      * Express Checkout button types source getter
+     *
      * @return array
      */
     public function getExpressCheckoutButtonTypes()
@@ -805,6 +821,7 @@ public function getExpressCheckoutButtonTypes()
 
     /**
      * Payment actions source getter
+     *
      * @return array
      */
     public function getPaymentActions()
@@ -821,6 +838,7 @@ public function getPaymentActions()
 
     /**
      * Mapper from PayPal-specific payment actions to Magento payment actions
+     *
      * @return string|null
      */
     public function getPaymentAction()
@@ -897,6 +915,7 @@ public function isWppApiAvailabe()
 
     /**
      * Payment data delivery methods getter for PayPal Standard
+     *
      * @return array
      */
     public function getWpsPaymentDeliveryMethods()
@@ -927,7 +946,7 @@ public function getWppCcTypesAsOptionArray()
      */
     public function getWppPeCcTypesAsOptionArray()
     {
-        $model = Mage::getModel('payment/source_cctype')->setAllowedTypes(array('VI', 'MC', 'SM', 'SO', 'OT'));
+        $model = Mage::getModel('payment/source_cctype')->setAllowedTypes(array('VI', 'MC', 'SM', 'SO', 'OT', 'AE'));
         return $model->toOptionArray();
     }
 
@@ -963,16 +982,27 @@ public static function getIsCreditCardMethod($code)
 
     /**
      * Check whether specified currency code is supported
+     *
      * @param string $code
      * @return bool
      */
     public function isCurrencyCodeSupported($code)
     {
-        return in_array($code, $this->_supportedCurrencyCodes);
+        if (in_array($code, $this->_supportedCurrencyCodes)) {
+            return true;
+        }
+        if ($this->getMerchantCountry() == 'BR' && $code == 'BRL') {
+            return true;
+        }
+        if ($this->getMerchantCountry() == 'MY' && $code == 'MYR') {
+            return true;
+        }
+        return false;
     }
 
     /**
      * Export page style current settings to specified object
+     *
      * @param Varien_Object $to
      */
     public function exportExpressCheckoutStyleSettings(Varien_Object $to)
@@ -1027,6 +1057,7 @@ protected function _getSupportedLocaleCode($localeCode = null)
 
     /**
      * Map any supported payment method into a config path by specified field name
+     *
      * @param string $fieldName
      * @return string|null
      */
@@ -1190,7 +1221,8 @@ protected function _mapWpukFieldset($fieldName)
     {
         $pathPrefix = 'paypal/wpuk';
         // Use PUMP credentials from Verisign for EC when Direct Payments are unavailable
-        if ($this->_methodCode == self::METHOD_WPP_PE_EXPRESS && !$this->isMethodAvailable(self::METHOD_WPP_PE_DIRECT)) {
+        if ($this->_methodCode == self::METHOD_WPP_PE_EXPRESS
+            && !$this->isMethodAvailable(self::METHOD_WPP_PE_DIRECT)) {
             $pathPrefix = 'payment/verisign';
         }
         switch ($fieldName) {
diff --git a/app/code/core/Mage/Paypal/Model/Express.php b/app/code/core/Mage/Paypal/Model/Express.php
index 6537cc42fc..77a79fa990 100644
--- a/app/code/core/Mage/Paypal/Model/Express.php
+++ b/app/code/core/Mage/Paypal/Model/Express.php
@@ -293,9 +293,11 @@ public function validateRecurringProfile(Mage_Payment_Model_Recurring_Profile $p
      * @param Mage_Payment_Model_Recurring_Profile $profile
      * @param Mage_Payment_Model_Info $paymentInfo
      */
-    public function submitRecurringProfile(Mage_Payment_Model_Recurring_Profile $profile, Mage_Payment_Model_Info $paymentInfo)
-    {
-        $token = $paymentInfo->getAdditionalInformation(Mage_Paypal_Model_Express_Checkout::PAYMENT_INFO_TRANSPORT_TOKEN);
+    public function submitRecurringProfile(Mage_Payment_Model_Recurring_Profile $profile,
+        Mage_Payment_Model_Info $paymentInfo
+    ) {
+        $token = $paymentInfo->
+            getAdditionalInformation(Mage_Paypal_Model_Express_Checkout::PAYMENT_INFO_TRANSPORT_TOKEN);
         $profile->setToken($token);
         $this->_pro->submitRecurringProfile($profile, $paymentInfo);
     }
@@ -373,7 +375,8 @@ protected function _placeOrder(Mage_Sales_Model_Order_Payment $payment, $amount)
         $token = $payment->getAdditionalInformation(Mage_Paypal_Model_Express_Checkout::PAYMENT_INFO_TRANSPORT_TOKEN);
         $api = $this->_pro->getApi()
             ->setToken($token)
-            ->setPayerId($payment->getAdditionalInformation(Mage_Paypal_Model_Express_Checkout::PAYMENT_INFO_TRANSPORT_PAYER_ID))
+            ->setPayerId($payment->
+                getAdditionalInformation(Mage_Paypal_Model_Express_Checkout::PAYMENT_INFO_TRANSPORT_PAYER_ID))
             ->setAmount($amount)
             ->setPaymentAction($this->_pro->getConfig()->paymentAction)
             ->setNotifyUrl(Mage::getUrl('paypal/ipn/'))
@@ -399,7 +402,7 @@ protected function _importToPayment($api, $payment)
     {
         $payment->setTransactionId($api->getTransactionId())->setIsTransactionClosed(0)
             ->setAdditionalInformation(Mage_Paypal_Model_Express_Checkout::PAYMENT_INFO_TRANSPORT_REDIRECT,
-                $api->getRedirectRequired() || $api->getRedirectRequested()
+                $api->getRedirectRequired()
             );
 
         if ($api->getBillingAgreementId()) {
diff --git a/app/code/core/Mage/Paypal/Model/Ipn.php b/app/code/core/Mage/Paypal/Model/Ipn.php
index 336b2e1b7d..c5a6442878 100644
--- a/app/code/core/Mage/Paypal/Model/Ipn.php
+++ b/app/code/core/Mage/Paypal/Model/Ipn.php
@@ -195,14 +195,19 @@ protected function _getRecurringProfile()
     {
         if (empty($this->_recurringProfile)) {
             // get proper recurring profile
-            $internalReferenceId = $this->_request['recurring_payment_id'];
-            $this->_recurringProfile = Mage::getModel('sales/recurring_profile')->loadByInternalReferenceId($internalReferenceId);
+            $internalReferenceId = $this->_request['rp_invoice_id'];
+            $this->_recurringProfile = Mage::getModel('sales/recurring_profile')
+                ->loadByInternalReferenceId($internalReferenceId);
             if (!$this->_recurringProfile->getId()) {
-                throw new Exception(sprintf('Wrong recurring profile INTERNAL_REFERENCE_ID: "%s".', $internalReferenceId));
+                throw new Exception(
+                    sprintf('Wrong recurring profile INTERNAL_REFERENCE_ID: "%s".', $internalReferenceId)
+                );
             }
             // re-initialize config with the method code and store id
             $methodCode = $this->_recurringProfile->getMethodCode();
-            $this->_config = Mage::getModel('paypal/config', array($methodCode, $this->_recurringProfile->getStoreId()));
+            $this->_config = Mage::getModel(
+                'paypal/config', array($methodCode, $this->_recurringProfile->getStoreId())
+            );
             if (!$this->_config->isMethodActive($methodCode) || !$this->_config->isMethodAvailable()) {
                 throw new Exception(sprintf('Method "%s" is not available.', $methodCode));
             }
@@ -226,7 +231,11 @@ protected function _verifyOrder()
                 $receiverEmail = $this->getRequestData('receiver_email');
             }
             if ($merchantEmail != $receiverEmail) {
-                throw new Exception(sprintf('Requested %s and configured %s merchant emails do not match.', $receiverEmail, $merchantEmail));
+                throw new Exception(
+                    sprintf(
+                        'Requested %s and configured %s merchant emails do not match.', $receiverEmail, $merchantEmail
+                    )
+                );
             }
         }
     }
@@ -336,9 +345,10 @@ protected function _registerRecurringProfilePaymentCapture()
     {
         $price = $this->getRequestData('mc_gross') - $this->getRequestData('tax') -  $this->getRequestData('shipping');
         $productItemInfo = new Varien_Object;
-        if ($this->getRequestData('period_type') == 'Trial') {
+        $type = trim($this->getRequestData('period_type'));
+        if ($type == 'Trial') {
             $productItemInfo->setPaymentType(Mage_Sales_Model_Recurring_Profile::PAYMENT_TYPE_TRIAL);
-        } elseif ($this->getRequestData('period_type') == 'Regular') {
+        } elseif ($type == 'Regular') {
             $productItemInfo->setPaymentType(Mage_Sales_Model_Recurring_Profile::PAYMENT_TYPE_REGULAR);
         }
         $productItemInfo->setTaxAmount($this->getRequestData('tax'));
diff --git a/app/code/core/Mage/Paypal/Model/Method/Agreement.php b/app/code/core/Mage/Paypal/Model/Method/Agreement.php
index 8b7f6d1a64..6b96038b32 100644
--- a/app/code/core/Mage/Paypal/Model/Method/Agreement.php
+++ b/app/code/core/Mage/Paypal/Model/Method/Agreement.php
@@ -295,7 +295,9 @@ protected function _placeOrder(Mage_Sales_Model_Order_Payment $payment, $amount)
     {
         $order = $payment->getOrder();
         $billingAgreement = Mage::getModel('sales/billing_agreement')->load(
-            $payment->getAdditionalInformation(Mage_Sales_Model_Payment_Method_Billing_AgreementAbstract::TRANSPORT_BILLING_AGREEMENT_ID)
+            $payment->getAdditionalInformation(
+                Mage_Sales_Model_Payment_Method_Billing_AgreementAbstract::TRANSPORT_BILLING_AGREEMENT_ID
+            )
         );
 
         $api = $this->_pro->getApi()
@@ -319,7 +321,7 @@ protected function _placeOrder(Mage_Sales_Model_Order_Payment $payment, $amount)
         if ($api->getBillingAgreementId()) {
             $order->addRelatedObject($billingAgreement);
             $billingAgreement->setIsObjectChanged(true);
-            $billingAgreement->addOrderRelation($order->getId());
+            $billingAgreement->addOrderRelation($order);
         }
 
         return $this;
diff --git a/app/code/core/Mage/Paypal/Model/Payflowlink.php b/app/code/core/Mage/Paypal/Model/Payflowlink.php
index 66b836ddcd..047dc7b97b 100644
--- a/app/code/core/Mage/Paypal/Model/Payflowlink.php
+++ b/app/code/core/Mage/Paypal/Model/Payflowlink.php
@@ -67,6 +67,13 @@ class Mage_Paypal_Model_Payflowlink extends Mage_Paypal_Model_Payflowpro
      */
     const RESPONSE_ERROR_MSG = 'Payment error. %s was not found.';
 
+    /**
+     * Key for storing secure hash in additional information of payment model
+     *
+     * @var string
+     */
+    protected $_secureSilentPostHashKey = 'secure_silent_post_hash';
+
     /**
      * Do not validate payment form using server methods
      *
@@ -110,7 +117,7 @@ public function initialize($paymentAction, $stateObject)
                 $order->setCanSendNewEmailFlag(false);
                 $payment->setAmountAuthorized($order->getTotalDue());
                 $payment->setBaseAmountAuthorized($order->getBaseTotalDue());
-
+                $this->_generateSecureSilentPostHash($payment);
                 $request = $this->_buildTokenRequest($payment);
                 $response = $this->_postRequest($request);
                 $this->_processTokenErrors($response, $payment);
@@ -170,8 +177,9 @@ public function process($responseData)
 
         $this->setResponseData($responseData);
 
-        $order = $this->_getOrderFromResponse();
-        $this->_processOrder($order);
+        if ($order = $this->_getOrderFromResponse()) {
+            $this->_processOrder($order);
+        }
     }
 
     /**
@@ -254,7 +262,12 @@ protected function _getOrderFromResponse()
         $response = $this->getResponse();
 
         $order = Mage::getModel('sales/order')
-                ->loadByIncrementId($response->getInvoice());
+                ->loadByIncrementId($response->getInvnum());
+
+        if ($this->_getSecureSilentPostHash($order->getPayment()) != $response->getUser2()
+            || $this->_code != $order->getPayment()->getMethodInstance()->getCode()) {
+            return false;
+        }
 
         if ($response->getResult() != self::RESPONSE_CODE_FRAUDSERVICE_FILTER &&
             $response->getResult() != self::RESPONSE_CODE_DECLINED_BY_FILTER &&
@@ -265,7 +278,7 @@ protected function _getOrderFromResponse()
             Mage::throwException($response->getRespmsg());
         }
 
-        $amountCompared = ($response->getAmount() ==
+        $amountCompared = ($response->getAmt() ==
             $order->getPayment()->getBaseAmountAuthorized()) ? true : false;
         if (!$order->getId() ||
             $order->getState() != Mage_Sales_Model_Order::STATE_PENDING_PAYMENT ||
@@ -330,7 +343,8 @@ protected function _buildTokenRequest(Varien_Object $payment)
                 ->setShiptocountry($shipping->getCountry());
         }
         //pass store Id to request
-        $request->setUser1($order->getStoreId());
+        $request->setUser1($order->getStoreId())
+            ->setUser2($this->_getSecureSilentPostHash($payment));
 
         return $request;
     }
@@ -426,4 +440,28 @@ protected function _processTokenErrors($response, $payment)
                 ->setAdditionalInformation('secure_token', $response->getSecuretoken());
         }
     }
+
+    /**
+     * Return secure hash value for silent post request
+     *
+     * @param Mage_Sales_Model_Order_Payment $payment
+     * @return string
+     */
+    protected function _getSecureSilentPostHash($payment)
+    {
+        return $payment->getAdditionalInformation($this->_secureSilentPostHashKey);
+    }
+
+    /**
+     * Generate end return new secure hash value
+     *
+     * @param Mage_Sales_Model_Order_Payment $payment
+     * @return string
+     */
+    protected function _generateSecureSilentPostHash($payment)
+    {
+        $secureHash = md5(Mage::helper('core')->getRandomString(10));
+        $payment->setAdditionalInformation($this->_secureSilentPostHashKey, $secureHash);
+        return $secureHash;
+    }
 }
diff --git a/app/code/core/Mage/Paypal/Model/Payflowpro.php b/app/code/core/Mage/Paypal/Model/Payflowpro.php
index 61a9b5d71b..0f3aeff24b 100644
--- a/app/code/core/Mage/Paypal/Model/Payflowpro.php
+++ b/app/code/core/Mage/Paypal/Model/Payflowpro.php
@@ -248,6 +248,7 @@ public function refund(Varien_Object $payment, $amount)
         $request = $this->_buildBasicRequest($payment);
         $request->setTrxtype(self::TRXTYPE_CREDIT);
         $request->setOrigid($payment->getParentTransactionId());
+        $request->setAmt(round($amount,2));
         $response = $this->_postRequest($request);
         $this->_processErrors($response);
 
@@ -334,7 +335,9 @@ protected function _postRequest(Varien_Object $request)
 
         $_isProxy = $this->getConfigData('use_proxy', false);
         if($_isProxy){
-            $_config['proxy'] = $this->getConfigData('proxy_host') . ':' . $this->getConfigData('proxy_port');//http://proxy.shr.secureserver.net:3128',
+            $_config['proxy'] = $this->getConfigData('proxy_host')
+                . ':'
+                . $this->getConfigData('proxy_port');//http://proxy.shr.secureserver.net:3128',
             $_config['httpproxytunnel'] = true;
             $_config['proxytype'] = CURLPROXY_HTTP;
         }
diff --git a/app/code/core/Mage/Paypal/controllers/PayflowController.php b/app/code/core/Mage/Paypal/controllers/PayflowController.php
index 0dff413c05..6d2f3d0f49 100644
--- a/app/code/core/Mage/Paypal/controllers/PayflowController.php
+++ b/app/code/core/Mage/Paypal/controllers/PayflowController.php
@@ -127,7 +127,7 @@ public function formAction()
     public function silentPostAction()
     {
         $data = $this->getRequest()->getPost();
-        if (isset($data['INVOICE'])) {
+        if (isset($data['INVNUM'])) {
             $paymentModel = Mage::getModel('paypal/payflowlink');
             try {
                 $paymentModel->process($data);
diff --git a/app/code/core/Mage/Paypal/etc/config.xml b/app/code/core/Mage/Paypal/etc/config.xml
index 6301bef0e1..49b393f810 100644
--- a/app/code/core/Mage/Paypal/etc/config.xml
+++ b/app/code/core/Mage/Paypal/etc/config.xml
@@ -212,7 +212,7 @@
             <paypaluk_direct>
                 <title>PayPal Direct Payment Payflow Edition</title>
                 <payment_action>Authorization</payment_action>
-                <cctypes>VI,MC</cctypes>
+                <cctypes>VI,MC,AE</cctypes>
                 <useccv>1</useccv>
                 <group>paypal</group>
             </paypaluk_direct>
diff --git a/app/code/core/Mage/Paypal/etc/system.xml b/app/code/core/Mage/Paypal/etc/system.xml
index 49f4dcda42..1a5a92ea97 100644
--- a/app/code/core/Mage/Paypal/etc/system.xml
+++ b/app/code/core/Mage/Paypal/etc/system.xml
@@ -96,6 +96,9 @@
                             <comment>Add an Express Checkout button to your existing shopping cart for quick and easy credit card payments. PayPal handles all payment processing.</comment>
                             <demo_url><![CDATA[https://merchant.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=merchant/demo_express_checkout]]></demo_url>
                             <more_url><![CDATA[https://www.paypal.com/cgi-bin/webscr?cmd=_simple-referral-flow&partner_id=NB9WWHYEMVUMS&product_id=ECA]]></more_url>
+                            <backend_congif>
+                                <enable_for_countries>all</enable_for_countries>
+                            </backend_congif>
                             <config_path>payment/paypal_express/active</config_path>
                             <frontend_type>checkbox</frontend_type>
                             <sort_order>10</sort_order>
@@ -107,6 +110,9 @@
                             <comment>PayPal processes all of your orders, and you get paid.</comment>
                             <demo_url><![CDATA[https://merchant.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=merchant/demo_WPS]]></demo_url>
                             <more_url><![CDATA[https://www.paypal.com/cgi-bin/webscr?cmd=_simple-referral-flow&partner_id=NB9WWHYEMVUMS&product_id=WPSA]]></more_url>
+                            <backend_congif>
+                                <enable_for_countries>all</enable_for_countries>
+                            </backend_congif>
                             <config_path>payment/paypal_standard/active</config_path>
                             <frontend_type>checkbox</frontend_type>
                             <sort_order>20</sort_order>
@@ -118,6 +124,9 @@
                             <comment>Process credit cards directly on your website with PayPal’s all-in-one online payment processing solution.</comment>
                             <demo_url><![CDATA[https://merchant.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=merchant/demo_wpp]]></demo_url>
                             <more_url><![CDATA[https://www.paypal.com/cgi-bin/webscr?cmd=_simple-referral-flow&partner_id=NB9WWHYEMVUMS&product_id=WPPROA]]></more_url>
+                            <backend_congif>
+                                <enable_for_countries>US, CA, GB</enable_for_countries>
+                            </backend_congif>
                             <config_path>payment/paypal_direct/active</config_path>
                             <frontend_type>checkbox</frontend_type>
                             <sort_order>25</sort_order>
@@ -127,6 +136,9 @@
                         <wpp_pe translate="label comment">
                             <label>Website Payments Pro Payflow Edition (includes Express Checkout)</label>
                             <comment>Accept PayPal payments in your shopping cart. PayPal will process your credit card payments through the Payflow Pro Gateway.</comment>
+                            <backend_congif>
+                                <enable_for_countries>US, GB</enable_for_countries>
+                            </backend_congif>
                             <config_path>payment/paypaluk_direct/active</config_path>
                             <frontend_type>checkbox</frontend_type>
                             <sort_order>30</sort_order>
@@ -137,6 +149,9 @@
                             <label>Payflow Pro Gateway</label>
                             <comment>Don’t have a PayPal merchant account? You can still accept credit card payments through the Payflow Pro Gateway.</comment>
                             <more_url><![CDATA[https://www.paypal.com/cgi-bin/webscr?cmd=_simple-referral-flow&partner_id=NB9WWHYEMVUMS&product_id=payflow_pro]]></more_url>
+                            <backend_congif>
+                                <enable_for_countries>US, CA, AU, NZ</enable_for_countries>
+                            </backend_congif>
                             <config_path>payment/verisign/active</config_path>
                             <frontend_type>checkbox</frontend_type>
                             <sort_order>35</sort_order>
@@ -146,6 +161,9 @@
                         <express_pe translate="label comment">
                             <label>Express Checkout</label>
                             <comment>Accept payments without customers leaving your website. Many popular web-hosting services and shopping carts come with the Payflow payment gateways built in, so they are easy to set up.</comment>
+                            <backend_congif>
+                                <enable_for_countries>US, GB</enable_for_countries>
+                            </backend_congif>
                             <config_path>payment/paypaluk_express/active</config_path>
                             <is_simplified>1</is_simplified>
                             <frontend_type>checkbox</frontend_type>
@@ -157,6 +175,9 @@
                             <label>Payflow Link (for USA and Canada)</label>
                             <comment>Quick set-up service lets your customers securely complete transactions.</comment>
                             <more_url><![CDATA[https://www.paypal.com/cgi-bin/webscr?cmd=_payflow-link-overview-outside]]></more_url>
+                            <backend_congif>
+                                <enable_for_countries>US, CA</enable_for_countries>
+                            </backend_congif>
                             <config_path>payment/payflow_link/active</config_path>
                             <frontend_type>checkbox</frontend_type>
                             <sort_order>50</sort_order>
@@ -164,9 +185,31 @@
                             <show_in_website>1</show_in_website>
                         </payflow_link>
                         <hosted_pro translate="label comment">
-                            <label>Website Payments Pro Hosted Solution (Website Payments Plus (JP) - Integral Evolution (FR) - PayPal Pro (IT) - Pasarela integral (ES))</label>
+                            <label>Website Payments Pro Hosted Solution</label>
                             <comment><![CDATA[Payments by cards + seller protection - <strong style="color:red">Contact PayPal before activating</strong>]]></comment>
                             <more_url><![CDATA[https://cms.paypal.com/cms_content/GB/en_GB/files/developer/HostedSolution.pdf]]></more_url>
+                            <backend_congif>
+                                <enable_for_countries>all</enable_for_countries>
+                                <disable_for_countries>US,CA</disable_for_countries>
+                                <labels>
+                                    <JP translate="switcher fieldset">
+                                        <switcher>Website Payments Plus</switcher>
+                                        <fieldset>Website Payments Plus Settings</fieldset>
+                                    </JP>
+                                    <FR translate="switcher fieldset">
+                                        <switcher>Integral Evolution</switcher>
+                                        <fieldset>Integral Evolution Settings</fieldset>
+                                    </FR>
+                                    <IT translate="switcher fieldset">
+                                        <switcher>PayPal Pro</switcher>
+                                        <fieldset>PayPal Pro Settings</fieldset>
+                                    </IT>
+                                    <ES translate="switcher fieldset">
+                                        <switcher>Pasarela integral</switcher>
+                                        <fieldset>Pasarela integral Settings</fieldset>
+                                    </ES>
+                                </labels>
+                            </backend_congif>
                             <config_path>payment/hosted_pro/active</config_path>
                             <frontend_type>checkbox</frontend_type>
                             <sort_order>60</sort_order>
@@ -651,7 +694,7 @@
                             <depends><centinel>1</centinel></depends>
                         </centinel_is_mode_strict>
                         <centinel_api_url translate="label comment">
-                            <label>Centinel Custom Api URL</label>
+                            <label>Centinel Custom API URL</label>
                             <config_path>payment/paypal_direct/centinel_api_url</config_path>
                             <comment>If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.</comment>
                             <frontend_type>text</frontend_type>
@@ -834,7 +877,7 @@
                             <show_in_website>1</show_in_website>
                         </line_items_enabled>
                         <heading_api translate="label">
-                            <label>Api/Integration</label>
+                            <label>API/Integration</label>
                             <frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
                             <sort_order>40</sort_order>
                             <show_in_default>1</show_in_default>
@@ -964,7 +1007,7 @@
                             <depends><centinel>1</centinel></depends>
                         </centinel_is_mode_strict>
                         <centinel_api_url translate="label comment">
-                            <label>Centinel Api URL</label>
+                            <label>Centinel API URL</label>
                             <config_path>payment/paypaluk_direct/centinel_api_url</config_path>
                             <comment>If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.</comment>
                             <frontend_type>text</frontend_type>
diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php
index e17ca96034..5225297872 100644
--- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php
+++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php
@@ -79,42 +79,38 @@ public function delete($object)
 
     public function addVote($option)
     {
-        $action = Mage::app()->getFrontController()->getAction();
-
-        if ($action instanceof Mage_Core_Controller_Front_Action || $action instanceof Mage_Adminhtml_Controller_Action) {
-            $optionData = $this->load($option->getId());
-            $data = array(
-                'option_id'     => $option->getId(),
-                'review_id'     => $option->getReviewId(),
-                'percent'       => (($optionData['value'] / 5) * 100),
-                'value'          => $optionData['value']
-            );
-
-            if( !$option->getDoUpdate() ) {
-                $data['remote_ip'] = Mage::helper('core/http')->getRemoteAddr();
-                $data['remote_ip_long'] = Mage::helper('core/http')->getRemoteAddr(true);
-                $data['customer_id'] = Mage::getSingleton('customer/session')->getCustomerId();
-                $data['entity_pk_value'] = $option->getEntityPkValue();
-                $data['rating_id'] = $option->getRatingId();
-            }
+        $optionData = $this->load($option->getId());
+        $data = array(
+            'option_id'     => $option->getId(),
+            'review_id'     => $option->getReviewId(),
+            'percent'       => (($optionData['value'] / 5) * 100),
+            'value'          => $optionData['value']
+        );
+
+        if( !$option->getDoUpdate() ) {
+            $data['remote_ip'] = Mage::helper('core/http')->getRemoteAddr();
+            $data['remote_ip_long'] = Mage::helper('core/http')->getRemoteAddr(true);
+            $data['customer_id'] = Mage::getSingleton('customer/session')->getCustomerId();
+            $data['entity_pk_value'] = $option->getEntityPkValue();
+            $data['rating_id'] = $option->getRatingId();
+        }
 
-            $this->_write->beginTransaction();
-            try {
-                if( $option->getDoUpdate() ) {
-                    $condition = "vote_id = '{$option->getVoteId()}' AND review_id = '{$option->getReviewId()}'";
-                    $this->_write->update($this->_ratingVoteTable, $data, $condition);
-                    $this->aggregate($option);
-                } else {
-                    $this->_write->insert($this->_ratingVoteTable, $data);
-                    $option->setVoteId($this->_write->lastInsertId());
-                    $this->aggregate($option);
-                }
-                $this->_write->commit();
-            }
-            catch (Exception $e){
-                $this->_write->rollback();
-                throw new Exception($e->getMessage());
+        $this->_write->beginTransaction();
+        try {
+            if( $option->getDoUpdate() ) {
+                $condition = "vote_id = '{$option->getVoteId()}' AND review_id = '{$option->getReviewId()}'";
+                $this->_write->update($this->_ratingVoteTable, $data, $condition);
+                $this->aggregate($option);
+            } else {
+                $this->_write->insert($this->_ratingVoteTable, $data);
+                $option->setVoteId($this->_write->lastInsertId());
+                $this->aggregate($option);
             }
+            $this->_write->commit();
+        }
+        catch (Exception $e){
+            $this->_write->rollback();
+            throw new Exception($e->getMessage());
         }
         return $this;
     }
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php
index 572e80e3b3..c3b961798e 100644
--- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php
@@ -118,7 +118,10 @@ public function getSelectCountSql()
         if ($this->_selectCountSqlType == self::SELECT_COUNT_SQL_TYPE_CART) {
             $countSelect = clone $this->getSelect();
             $countSelect->reset()
-                ->from(array('quote_item_table' => $this->getTable('sales/quote_item')), 'COUNT(DISTINCT quote_item_table.product_id)')
+                ->from(
+                    array('quote_item_table' => $this->getTable('sales/quote_item')),
+                    'COUNT(DISTINCT quote_item_table.product_id)'
+                )
                 ->join(
                     array('quote_table' => $this->getTable('sales/quote')),
                     'quote_table.entity_id = quote_item_table.quote_id AND quote_table.is_active = 1',
@@ -216,7 +219,20 @@ public function addOrderedQty($from = '', $to = '')
 
         $this->getSelect()
             ->joinLeft(array('e' => $this->getProductEntityTableName()),
-                "e.entity_id = order_items.{$productIdFieldName} AND e.entity_type_id = {$this->getProductEntityTypeId()}{$productTypes}")
+                "e.entity_id = order_items.{$productIdFieldName}
+                AND e.entity_type_id = {$this->getProductEntityTypeId()}{$productTypes}",
+                array(
+                    'entity_id' => 'order_items.product_id',
+                    'entity_type_id' => 'e.entity_type_id',
+                    'attribute_set_id' => 'e.attribute_set_id',
+                    'type_id' => 'e.type_id',
+                    'sku' => 'e.sku',
+                    'has_options' => 'e.has_options',
+                    'required_options' => 'e.required_options',
+                    'created_at' => 'e.created_at',
+                    'updated_at' => 'e.updated_at'
+                )
+            )
             ->group('order_items.product_id')
             ->having('ordered_qty > 0');
 
@@ -270,4 +286,34 @@ public function addViewsCount($from = '', $to = '')
 
         return $this;
     }
+
+    /**
+     * Add store restrictions to product collection
+     *
+     * @param  array $storeIds
+     * @param  array $websiteIds
+     * @return Mage_Reports_Model_Mysql4_Product_Collection
+     */
+    public function addStoreRestrictions($storeIds, $websiteIds)
+    {
+        if (!is_array($storeIds)) {
+            $storeIds = array($storeIds);
+        }
+        if (!is_array($websiteIds)) {
+            $websiteIds = array($websiteIds);
+        }
+
+        $filters = $this->_productLimitationFilters;
+        if ($filters['store_id']) {
+            if (!in_array($filters['store_id'], $storeIds)) {
+                $this->addStoreFilter($filters['store_id']);
+            } else {
+                $this->addStoreFilter($this->getStoreId());
+            }
+        } else {
+            $this->addWebsiteFilter($websiteIds);
+        }
+
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php
index 9d076279bc..1cbb5de142 100644
--- a/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php
@@ -83,10 +83,10 @@ public function prepareForProductsInCarts()
     {
         $productEntity          = Mage::getResourceSingleton('catalog/product_collection');
         $productAttrName        = $productEntity->getAttribute('name');
-        $productAttrNameId      = $productAttrName->getAttributeId();
+        $productAttrNameId      = (int) $productAttrName->getAttributeId();
         $productAttrNameTable   = $productAttrName->getBackend()->getTable();
         $productAttrPrice       = $productEntity->getAttribute('price');
-        $productAttrPriceId     = $productAttrPrice->getAttributeId();
+        $productAttrPriceId     = (int) $productAttrPrice->getAttributeId();
         $productAttrPriceTable  = $productAttrPrice->getBackend()->getTable();
 
         $ordersSubSelect = clone $this->getSelect();
@@ -128,14 +128,14 @@ public function addStoreFilter($storeIds)
 
     public function addCustomerData($filter = null)
     {
-        $customerEntity = Mage::getResourceSingleton('customer/customer');
-        $attrFirstname = $customerEntity->getAttribute('firstname');
-        $attrFirstnameId = $attrFirstname->getAttributeId();
+        $customerEntity         = Mage::getResourceSingleton('customer/customer');
+        $attrFirstname          = $customerEntity->getAttribute('firstname');
+        $attrFirstnameId        = (int) $attrFirstname->getAttributeId();
         $attrFirstnameTableName = $attrFirstname->getBackend()->getTable();
 
-        $attrLastname = $customerEntity->getAttribute('lastname');
-        $attrLastnameId = $attrLastname->getAttributeId();
-        $attrLastnameTableName = $attrLastname->getBackend()->getTable();
+        $attrLastname           = $customerEntity->getAttribute('lastname');
+        $attrLastnameId         = (int) $attrLastname->getAttributeId();
+        $attrLastnameTableName  = $attrLastname->getBackend()->getTable();
 
         $attrEmail = $customerEntity->getAttribute('email');
         $attrEmailTableName = $attrEmail->getBackend()->getTable();
@@ -148,12 +148,12 @@ public function addCustomerData($filter = null)
             )
             ->joinInner(
                 array('cust_fname'=>$attrFirstnameTableName),
-                'cust_fname.entity_id=main_table.customer_id and cust_fname.attribute_id='.$attrFirstnameId,
+                'cust_fname.entity_id=main_table.customer_id and cust_fname.attribute_id=' . $attrFirstnameId,
                 array('firstname'=>'cust_fname.value')
             )
             ->joinInner(
                 array('cust_lname'=>$attrLastnameTableName),
-                'cust_lname.entity_id=main_table.customer_id and cust_lname.attribute_id='.$attrLastnameId,
+                'cust_lname.entity_id=main_table.customer_id and cust_lname.attribute_id=' . $attrLastnameId,
                 array(
                     'lastname'=>'cust_lname.value',
                     'customer_name' => new Zend_Db_Expr('CONCAT(cust_fname.value, " ", cust_lname.value)')
@@ -165,10 +165,16 @@ public function addCustomerData($filter = null)
 
         if ($filter) {
             if (isset($filter['customer_name'])) {
-                $this->getSelect()->where($this->_joinedFields['customer_name'] . ' LIKE "%' . $filter['customer_name'] . '%"');
+                $this->getSelect()->where(
+                    $this->_joinedFields['customer_name'] . ' LIKE ?',
+                    "%{$filter['customer_name']}%"
+                );
             }
             if (isset($filter['email'])) {
-                $this->getSelect()->where($this->_joinedFields['email'] . ' LIKE "%' . $filter['email'] . '%"');
+                $this->getSelect()->where(
+                    $this->_joinedFields['email'] . ' LIKE ?',
+                    "%{$filter['email']}%"
+                );
             }
         }
 
@@ -187,10 +193,16 @@ public function addSubtotal($storeIds = '', $filter = null)
 
         if ($filter && is_array($filter) && isset($filter['subtotal'])) {
             if (isset($filter['subtotal']['from'])) {
-                $this->getSelect()->where($this->_joinedFields['subtotal'] . ' >= ' . $filter['subtotal']['from']);
+                $this->getSelect()->where(
+                    $this->_joinedFields['subtotal'] . ' >= ?',
+                    $filter['subtotal']['from'], Zend_Db::FLOAT_TYPE
+                );
             }
             if (isset($filter['subtotal']['to'])) {
-                $this->getSelect()->where($this->_joinedFields['subtotal'] . ' <= ' . $filter['subtotal']['to']);
+                $this->getSelect()->where(
+                    $this->_joinedFields['subtotal'] . ' <= ?',
+                    $filter['subtotal']['to'], Zend_Db::FLOAT_TYPE
+                );
             }
         }
 
diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php
index 22db7e00a2..298bb36af1 100644
--- a/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php
@@ -30,6 +30,8 @@
  * @category   Mage
  * @package    Mage_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
+ *
+ * @deprecated after 1.5.0.1
  */
 
 class Mage_Reports_Model_Mysql4_Shopcart_Product_Collection extends Mage_Reports_Model_Mysql4_Product_Collection
diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php
index 58ac97475e..77e3b71cbc 100644
--- a/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php
+++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php
@@ -32,11 +32,13 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-class Mage_Review_Model_Mysql4_Review_Product_Collection extends Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection
+class Mage_Review_Model_Mysql4_Review_Product_Collection
+    extends Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection
 {
-    protected $_entitiesAlias = array();
+    protected $_entitiesAlias       = array();
     protected $_reviewStoreTable;
-    protected $_addStoreDataFlag = false;
+    protected $_addStoreDataFlag    = false;
+    protected $_storesIds           = array();
 
     protected function _construct()
     {
@@ -53,31 +55,82 @@ protected function _initSelect()
         return $this;
     }
 
-    public function addStoreFilter($storeId=null)
+    /**
+     * Adds store filter into array
+     *
+     * @param mixed $storeId
+     * @return Mage_Review_Model_Mysql4_Review_Product_Collection
+     */
+    public function addStoreFilter($storeId = null)
     {
+        if (is_null($storeId)) {
+            $storeId = $this->getStoreId();
+        }
+
         parent::addStoreFilter($storeId);
-        $this->getSelect()
-            ->join(array('store'=>$this->_reviewStoreTable),
-                'rt.review_id=store.review_id AND store.store_id=' . (int)$storeId, array());
+
+        if (!is_array($storeId)) {
+            $storeId = array($storeId);
+        }
+
+        if (!empty($this->_storesIds)) {
+            $this->_storesIds = array_intersect($this->_storesIds, $storeId);
+        } else {
+            $this->_storesIds = $storeId;
+        }
+
         return $this;
     }
 
+    /**
+     * Adds specific store id into array
+     *
+     * @param array $storeId
+     * @return Mage_Review_Model_Mysql4_Review_Product_Collection
+     */
     public function setStoreFilter($storeId)
     {
-        if( is_array($storeId) && isset($storeId['eq']) ) {
+        if (is_array($storeId) && isset($storeId['eq'])) {
             $storeId = array_shift($storeId);
         }
 
-        if( is_array($storeId) ) {
-            $this->getSelect()
-                ->join(array('store'=>$this->_reviewStoreTable),
-                    $this->getConnection()->quoteInto('rt.review_id=store.review_id AND store.store_id IN(?)', $storeId), array())
-                ->distinct(true)
+        if (!is_array($storeId)){
+            $storeId = array($storeId);
+        }
+
+        if (!empty($this->_storesIds)){
+            $this->_storesIds = array_intersect($this->_storesIds, $storeId);
+        } else {
+            $this->_storesIds = $storeId;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Applies all store filters in one place to prevent multiple joins in select
+     *
+     * @param null|Zend_Db_Select $select
+     * @return Mage_Review_Model_Mysql4_Review_Product_Collection
+     */
+    protected function _applyStoresFilterToSelect(Zend_Db_Select $select = null)
+    {
+        $storesIds = $this->_storesIds;
+
+        if (is_null($select)){
+            $select = $this->getSelect();
+        }
+
+        if (is_array($storesIds) && !empty($storesIds)) {
+            $select->join(
+                array('store'=>$this->_reviewStoreTable),
+                $this->getConnection()->quoteInto('rt.review_id=store.review_id AND store.store_id IN(?)', $storesIds),
+                array())
+            ->distinct(true)
                 ;
         } else {
-            $this->getSelect()
-                ->join(array('store'=>$this->_reviewStoreTable),
-                    'rt.review_id=store.review_id AND store.store_id=' . (int)$storeId, array());
+            $select->join(array('store'=>$this->_reviewStoreTable),
+                    'rt.review_id=store.review_id AND store.store_id=' . (int)$storesIds, array());
         }
 
         return $this;
@@ -231,7 +284,7 @@ public function addAttributeToFilter($attribute, $condition=null, $joinType='inn
                 $this->getSelect()->where($conditionSql);
                 return $this;
                 break;
-           case 'stores':
+            case 'stores':
                 $this->setStoreFilter($condition);
                 return $this;
                 break;
@@ -301,4 +354,17 @@ protected function _addStoreData()
 
         }
     }
+
+    /**
+     * Redeclare parent method for store filters applying
+     *
+     * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection
+     */
+    protected function _beforeLoad()
+    {
+        parent::_beforeLoad();
+        $this->_applyStoresFilterToSelect();
+
+        return $this;
+    }
  }
diff --git a/app/code/core/Mage/Rule/Model/Condition/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
index 3769c4905c..d6667b6240 100644
--- a/app/code/core/Mage/Rule/Model/Condition/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
@@ -254,7 +254,7 @@ public function getValueParsed()
         $value = $this->getData('value');
 
         $op = $this->getOperator();
-        if (($op === '{}' || $op === '!{}' || $op==='()' || $op==='!()') && is_string($value)) {
+        if (($op === '{}' || $op === '!{}' || $op==='()' || $op==='!()') && is_scalar($value)) {
             $value = preg_split('#\s*[,;]\s*#', $value, null, PREG_SPLIT_NO_EMPTY);
             $this->setValue($value);
         }
@@ -266,8 +266,10 @@ public function getValue()
     {
         if ($this->getInputType()=='date' && !$this->getIsValueParsed()) {
             // date format intentionally hard-coded
-            $this->setValue(Mage::app()->getLocale()->date($this->getData('value'), Varien_Date::DATE_INTERNAL_FORMAT, null, false)
-                ->toString(Varien_Date::DATE_INTERNAL_FORMAT));
+            $this->setValue(
+                Mage::app()->getLocale()->date($this->getData('value'),
+                Varien_Date::DATE_INTERNAL_FORMAT, null, false)->toString(Varien_Date::DATE_INTERNAL_FORMAT)
+            );
             $this->setIsValueParsed(true);
         }
         return $this->getData('value');
@@ -558,7 +560,14 @@ public function validateAttribute($validatedValue)
                 break;
 
             case '{}': case '!{}':
-                if (is_array($value)) {
+                if (is_scalar($validatedValue) && is_array($value)) {
+                    foreach ($value as $item) {
+                        if (stripos($validatedValue,$item)!==false) {
+                            $result = true;
+                            break;
+                        }
+                    }
+                } elseif (is_array($value)) {
                     if (is_array($validatedValue)) {
                         $result = array_intersect($value, $validatedValue);
                         $result = !empty($result);
diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php
index e50f22796a..3bd692afad 100644
--- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php
+++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php
@@ -78,4 +78,14 @@ public function getSku($item)
         else
             return $item->getSku();
     }
+
+    /**
+     * Return product additional information block
+     *
+     * @return Mage_Core_Block_Abstract
+     */
+    public function getProductAdditionalInformationBlock()
+    {
+        return $this->getLayout()->getBlock('additional.product.info');
+    }
 }
diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php
index 42a9dafeb2..5c5ac25e49 100644
--- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php
+++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php
@@ -78,4 +78,14 @@ public function getSku($item)
         else
             return $item->getSku();
     }
+
+    /**
+     * Return product additional information block
+     *
+     * @return Mage_Core_Block_Abstract
+     */
+    public function getProductAdditionalInformationBlock()
+    {
+        return $this->getLayout()->getBlock('additional.product.info');
+    }
 }
diff --git a/app/code/core/Mage/Sales/Model/Billing/Agreement.php b/app/code/core/Mage/Sales/Model/Billing/Agreement.php
index 46dda00047..49dc751e46 100644
--- a/app/code/core/Mage/Sales/Model/Billing/Agreement.php
+++ b/app/code/core/Mage/Sales/Model/Billing/Agreement.php
@@ -248,7 +248,7 @@ public function needToCreateForCustomer($customerId)
     /**
      * Add order relation to current billing agreement
      *
-     * @param int $orderId
+     * @param int|Mage_Sales_Model_Order $orderId
      * @return Mage_Sales_Model_Billing_Agreement
      */
     public function addOrderRelation($orderId)
@@ -262,7 +262,8 @@ public function addOrderRelation($orderId)
      */
     protected function _saveOrderRelations()
     {
-        foreach ($this->_relatedOrders as $orderId) {
+        foreach ($this->_relatedOrders as $order) {
+            $orderId = $order instanceof Mage_Sales_Model_Order ? $order->getId() : (int) $order;
             $this->getResource()->addOrderRelation($this->getId(), $orderId);
         }
     }
diff --git a/app/code/core/Mage/Sales/Model/Convert/Quote.php b/app/code/core/Mage/Sales/Model/Convert/Quote.php
index b5603f7e85..df5c48800f 100644
--- a/app/code/core/Mage/Sales/Model/Convert/Quote.php
+++ b/app/code/core/Mage/Sales/Model/Convert/Quote.php
@@ -131,7 +131,9 @@ public function itemToOrderItem(Mage_Sales_Model_Quote_Item_Abstract $item)
             ->setProductId($item->getProductId())
             ->setProductType($item->getProductType())
             ->setQtyBackordered($item->getBackorders())
-            ->setProduct($item->getProduct());
+            ->setProduct($item->getProduct())
+            ->setBaseOriginalPrice($item->getBaseOriginalPrice());
+
         $options = $item->getProductOrderOptions();
         if (!$options) {
             $options = $item->getProduct()->getTypeInstance(true)->getOrderOptions($item->getProduct());
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php
index 3a8034998f..aaff553852 100644
--- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php
@@ -105,155 +105,234 @@ protected function _makeBoundarySelect($from, $to)
      */
     protected function _initSelect()
     {
+        $select = $this->getSelect();
+
         // if grouping by product, not by period
         if (!$this->_period) {
             $cols = $this->_getSelectedColumns();
             $cols['qty_ordered'] = 'SUM(qty_ordered)';
             if ($this->_from || $this->_to) {
-                $this->getSelect()->from($this->getTable('sales/bestsellers_aggregated_daily'), $cols);
+                $select->from($this->getTable('sales/bestsellers_aggregated_daily'), $cols);
             } else {
-                $this->getSelect()->from($this->getTable('sales/bestsellers_aggregated_yearly'), $cols);
+                $select->from($this->getTable('sales/bestsellers_aggregated_yearly'), $cols);
             }
-            $this->_applyStoresFilter();
-            $this->_applyDateRangeFilter();
-            $this->getSelect()
+            $select
                 ->group('product_id')
                 ->order('qty_ordered DESC')
                 ->limit($this->_ratingLimit);
+
             return $this;
         }
 
 
         if ('year' == $this->_period) {
-            $this->getSelect()->from($this->getTable('sales/bestsellers_aggregated_yearly'), $this->_getSelectedColumns());
+            $select->from($this->getTable('sales/bestsellers_aggregated_yearly'), $this->_getSelectedColumns());
         } else if ('month' == $this->_period) {
-            $this->getSelect()->from($this->getTable('sales/bestsellers_aggregated_monthly'), $this->_getSelectedColumns());
+            $select->from($this->getTable('sales/bestsellers_aggregated_monthly'), $this->_getSelectedColumns());
         } else {
-            $this->getSelect()->from($this->getTable('sales/bestsellers_aggregated_daily'), $this->_getSelectedColumns());
+            $select->from($this->getTable('sales/bestsellers_aggregated_daily'), $this->_getSelectedColumns());
         }
         if (!$this->isTotals()) {
-            $this->getSelect()->group(array('period', 'product_id'));
+            $select->group(array('period', 'product_id'));
         }
-        $this->getSelect()->where('rating_pos <= ?', $this->_ratingLimit);
+        $select->where('rating_pos <= ?', $this->_ratingLimit);
 
-        //
-        $selectUnions = array();
+        return $this;
+    }
 
-        // apply date boundaries (before calling $this->_applyDateRangeFilter())
-        $dtFormat   = Varien_Date::DATE_INTERNAL_FORMAT;
-        $periodFrom = (!is_null($this->_from) ? new Zend_Date($this->_from, $dtFormat) : null);
-        $periodTo   = (!is_null($this->_to)   ? new Zend_Date($this->_to,   $dtFormat) : null);
-        if ('year' == $this->_period) {
+    /**
+     * Get SQL for get record count
+     *
+     * @return Varien_Db_Select
+     */
+    public function getSelectCountSql()
+    {
+        $this->_renderFilters();
+        return $this->getConnection()->select()->from($this->getSelect(), 'COUNT(*)');
+    }
+
+    /**
+     * Set ids for store restrictions
+     *
+     * @param  array $storeIds
+     * @return Mage_Sales_Model_Mysql4_Report_Bestsellers_Collection
+     */
+    public function addStoreRestrictions($storeIds)
+    {
+        if (!is_array($storeIds)) {
+            $storeIds = array($storeIds);
+        }
+        $currentStoreIds = $this->_storesIds;
+        if (isset($currentStoreIds) && $currentStoreIds != Mage_Core_Model_App::ADMIN_STORE_ID
+            && $currentStoreIds != array(Mage_Core_Model_App::ADMIN_STORE_ID)) {
+            if (!is_array($currentStoreIds)) {
+                $currentStoreIds = array($currentStoreIds);
+            }
+            $this->_storesIds = array_intersect($currentStoreIds, $storeIds);
+        } else {
+            $this->_storesIds = $storeIds;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Redeclare parent method for applying filters after parent method
+     * but before adding unions and calculating totals
+     *
+     * @return Mage_Sales_Model_Mysql4_Report_Bestsellers_Collection
+     */
+    protected function _beforeLoad()
+    {
+        parent::_beforeLoad();
+
+        $this->_applyStoresFilter();
+        $this->_applyDateRangeFilter();
 
-            if ($periodFrom) {
-                if ($periodFrom->toValue(Zend_Date::MONTH) != 1 || $periodFrom->toValue(Zend_Date::DAY) != 1) {  // not the first day of the year
-                    $dtFrom = $periodFrom->getDate();
-                    $dtTo = $periodFrom->getDate()->setMonth(12)->setDay(31);  // last day of the year
-                    if (!$periodTo || $dtTo->isEarlier($periodTo)) {
-                        $selectUnions[] = $this->_makeBoundarySelect($dtFrom->toString($dtFormat), $dtTo->toString($dtFormat));
+        if ($this->_period) {
+            //
+            $selectUnions = array();
 
-                        $this->_from = $periodFrom->getDate()->addYear(1)->setMonth(1)->setDay(1)->toString($dtFormat);  // first day of the next year
+            // apply date boundaries (before calling $this->_applyDateRangeFilter())
+            $dtFormat   = Varien_Date::DATE_INTERNAL_FORMAT;
+            $periodFrom = (!is_null($this->_from) ? new Zend_Date($this->_from, $dtFormat) : null);
+            $periodTo   = (!is_null($this->_to)   ? new Zend_Date($this->_to,   $dtFormat) : null);
+            if ('year' == $this->_period) {
+
+                if ($periodFrom) {
+                    // not the first day of the year
+                    if ($periodFrom->toValue(Zend_Date::MONTH) != 1 || $periodFrom->toValue(Zend_Date::DAY) != 1) {
+                        $dtFrom = $periodFrom->getDate();
+                        // last day of the year
+                        $dtTo = $periodFrom->getDate()->setMonth(12)->setDay(31);
+                        if (!$periodTo || $dtTo->isEarlier($periodTo)) {
+                            $selectUnions[] = $this->_makeBoundarySelect(
+                                $dtFrom->toString($dtFormat),
+                                $dtTo->toString($dtFormat)
+                            );
+
+                            // first day of the next year
+                            $this->_from = $periodFrom->getDate()
+                                ->addYear(1)
+                                ->setMonth(1)
+                                ->setDay(1)
+                                ->toString($dtFormat);
+                        }
                     }
                 }
-            }
 
-            if ($periodTo) {
-                if ($periodTo->toValue(Zend_Date::MONTH) != 12 || $periodTo->toValue(Zend_Date::DAY) != 31) {  // not the last day of the year
-                    $dtFrom = $periodTo->getDate()->setMonth(1)->setDay(1);  // first day of the year
-                    $dtTo = $periodTo->getDate();
-                    if (!$periodFrom || $dtFrom->isLater($periodFrom)) {
-                        $selectUnions[] = $this->_makeBoundarySelect($dtFrom->toString($dtFormat), $dtTo->toString($dtFormat));
+                if ($periodTo) {
+                    // not the last day of the year
+                    if ($periodTo->toValue(Zend_Date::MONTH) != 12 || $periodTo->toValue(Zend_Date::DAY) != 31) {
+                        $dtFrom = $periodTo->getDate()->setMonth(1)->setDay(1);  // first day of the year
+                        $dtTo = $periodTo->getDate();
+                        if (!$periodFrom || $dtFrom->isLater($periodFrom)) {
+                            $selectUnions[] = $this->_makeBoundarySelect(
+                                $dtFrom->toString($dtFormat),
+                                $dtTo->toString($dtFormat)
+                            );
 
-                        $this->_to = $periodTo->getDate()->subYear(1)->setMonth(12)->setDay(31)->toString($dtFormat);  // last day of the previous year
+                            // last day of the previous year
+                            $this->_to = $periodTo->getDate()
+                                ->subYear(1)
+                                ->setMonth(12)
+                                ->setDay(31)
+                                ->toString($dtFormat);
+                        }
                     }
                 }
-            }
 
-            if ($periodFrom && $periodTo) {
-                if ($periodFrom->toValue(Zend_Date::YEAR) == $periodTo->toValue(Zend_Date::YEAR)) {  // the same year
-                    $dtFrom = $periodFrom->getDate();
-                    $dtTo = $periodTo->getDate();
-                    $selectUnions[] = $this->_makeBoundarySelect($dtFrom->toString($dtFormat), $dtTo->toString($dtFormat));
+                if ($periodFrom && $periodTo) {
+                    // the same year
+                    if ($periodFrom->toValue(Zend_Date::YEAR) == $periodTo->toValue(Zend_Date::YEAR)) {
+                        $dtFrom = $periodFrom->getDate();
+                        $dtTo = $periodTo->getDate();
+                        $selectUnions[] = $this->_makeBoundarySelect(
+                            $dtFrom->toString($dtFormat),
+                            $dtTo->toString($dtFormat)
+                        );
 
-                    $this->getSelect()->where('1<>1');
+                        $this->getSelect()->where('1<>1');
+                    }
                 }
-            }
 
-        }
-        else if ('month' == $this->_period) {
+            }
+            else if ('month' == $this->_period) {
 
-            if ($periodFrom) {
-                if ($periodFrom->toValue(Zend_Date::DAY) != 1) {  // not the first day of the month
-                    $dtFrom = $periodFrom->getDate();
-                    $dtTo = $periodFrom->getDate()->addMonth(1)->setDay(1)->subDay(1);  // last day of the month
-                    if (!$periodTo || $dtTo->isEarlier($periodTo)) {
-                        $selectUnions[] = $this->_makeBoundarySelect($dtFrom->toString($dtFormat), $dtTo->toString($dtFormat));
+                if ($periodFrom) {
+                    // not the first day of the month
+                    if ($periodFrom->toValue(Zend_Date::DAY) != 1) {
+                        $dtFrom = $periodFrom->getDate();
+                        // last day of the month
+                        $dtTo = $periodFrom->getDate()->addMonth(1)->setDay(1)->subDay(1);
+                        if (!$periodTo || $dtTo->isEarlier($periodTo)) {
+                            $selectUnions[] = $this->_makeBoundarySelect(
+                                $dtFrom->toString($dtFormat),
+                                $dtTo->toString($dtFormat)
+                            );
 
-                        $this->_from = $periodFrom->getDate()->addMonth(1)->setDay(1)->toString($dtFormat);  // first day of the next month
+                            // first day of the next month
+                            $this->_from = $periodFrom->getDate()->addMonth(1)->setDay(1)->toString($dtFormat);
+                        }
                     }
                 }
-            }
 
-            if ($periodTo) {
-                if ($periodTo->toValue(Zend_Date::DAY) != $periodTo->toValue(Zend_Date::MONTH_DAYS)) {  // not the last day of the month
-                    $dtFrom = $periodTo->getDate()->setDay(1);  // first day of the month
-                    $dtTo = $periodTo->getDate();
-                    if (!$periodFrom || $dtFrom->isLater($periodFrom)) {
-                        $selectUnions[] = $this->_makeBoundarySelect($dtFrom->toString($dtFormat), $dtTo->toString($dtFormat));
+                if ($periodTo) {
+                    // not the last day of the month
+                    if ($periodTo->toValue(Zend_Date::DAY) != $periodTo->toValue(Zend_Date::MONTH_DAYS)) {
+                        $dtFrom = $periodTo->getDate()->setDay(1);  // first day of the month
+                        $dtTo = $periodTo->getDate();
+                        if (!$periodFrom || $dtFrom->isLater($periodFrom)) {
+                            $selectUnions[] = $this->_makeBoundarySelect(
+                                $dtFrom->toString($dtFormat),
+                                $dtTo->toString($dtFormat)
+                            );
 
-                        $this->_to = $periodTo->getDate()->setDay(1)->subDay(1)->toString($dtFormat);  // last day of the previous month
+                            // last day of the previous month
+                            $this->_to = $periodTo->getDate()->setDay(1)->subDay(1)->toString($dtFormat);
+                        }
                     }
                 }
-            }
 
-            if ($periodFrom && $periodTo) {
-                if ($periodFrom->toValue(Zend_Date::YEAR) == $periodTo->toValue(Zend_Date::YEAR)
-                    && $periodFrom->toValue(Zend_Date::MONTH) == $periodTo->toValue(Zend_Date::MONTH)) {  // the same month
-                    $dtFrom = $periodFrom->getDate();
-                    $dtTo = $periodTo->getDate();
-                    $selectUnions[] = $this->_makeBoundarySelect($dtFrom->toString($dtFormat), $dtTo->toString($dtFormat));
+                if ($periodFrom && $periodTo) {
+                    if ($periodFrom->toValue(Zend_Date::YEAR) == $periodTo->toValue(Zend_Date::YEAR)
+                        // the same month
+                        && $periodFrom->toValue(Zend_Date::MONTH) == $periodTo->toValue(Zend_Date::MONTH)
+                    ) {
+                        $dtFrom = $periodFrom->getDate();
+                        $dtTo = $periodTo->getDate();
+                        $selectUnions[] = $this->_makeBoundarySelect(
+                            $dtFrom->toString($dtFormat),
+                            $dtTo->toString($dtFormat)
+                        );
 
-                    $this->getSelect()->where('1<>1');
+                        $this->getSelect()->where('1<>1');
+                    }
                 }
-            }
-
-        }
 
-        $this->_applyStoresFilter();
-        $this->_applyDateRangeFilter();
+            }
 
-        // add unions to select
-        if ($selectUnions) {
-            $unionParts = array();
-            $cloneSelect = clone $this->getSelect();
-            $unionParts[] = '(' . $cloneSelect . ')';
-            foreach ($selectUnions as $union) {
-                $unionParts[] = '(' . $union . ')';
+            // add unions to select
+            if ($selectUnions) {
+                $unionParts = array();
+                $cloneSelect = clone $this->getSelect();
+                $unionParts[] = '(' . $cloneSelect . ')';
+                foreach ($selectUnions as $union) {
+                    $unionParts[] = '(' . $union . ')';
+                }
+                $this->getSelect()->reset()->union($unionParts, Zend_Db_Select::SQL_UNION_ALL);
             }
-            $this->getSelect()->reset()->union($unionParts, Zend_Db_Select::SQL_UNION_ALL);
-        }
 
-        if ($this->isTotals()) {
-            // calculate total
-            $cloneSelect = clone $this->getSelect();
-            $this->getSelect()->reset()->from($cloneSelect, $this->getAggregatedColumns());
-        } else {
-            // add sorting
-            $this->getSelect()->order(array('period ASC', 'qty_ordered DESC'));
+            if ($this->isTotals()) {
+                // calculate total
+                $cloneSelect = clone $this->getSelect();
+                $this->getSelect()->reset()->from($cloneSelect, $this->getAggregatedColumns());
+            } else {
+                // add sorting
+                $this->getSelect()->order(array('period ASC', 'qty_ordered DESC'));
+            }
         }
 
         return $this;
     }
-
-    /**
-     * Get SQL for get record count
-     *
-     * @return Varien_Db_Select
-     */
-    public function getSelectCountSql()
-    {
-        $this->_renderFilters();
-        return $this->getConnection()->select()->from($this->getSelect(), 'COUNT(*)');
-    }
-
 }
diff --git a/app/code/core/Mage/Sales/Model/Order.php b/app/code/core/Mage/Sales/Model/Order.php
index 59a7a4d894..588f39c60a 100644
--- a/app/code/core/Mage/Sales/Model/Order.php
+++ b/app/code/core/Mage/Sales/Model/Order.php
@@ -800,7 +800,10 @@ public function cancel()
         if ($this->canCancel()) {
             $this->getPayment()->cancel();
             $this->registerCancellation();
+
+            Mage::dispatchEvent('order_cancel_after', array('order' => $this));
         }
+
         return $this;
     }
 
diff --git a/app/code/core/Mage/Sales/Model/Order/Config.php b/app/code/core/Mage/Sales/Model/Order/Config.php
index f67295a9f4..27fd743832 100644
--- a/app/code/core/Mage/Sales/Model/Order/Config.php
+++ b/app/code/core/Mage/Sales/Model/Order/Config.php
@@ -203,7 +203,8 @@ private function _getStates()
             foreach ($this->getNode('states')->children() as $state) {
                 $name = $state->getName();
                 $this->_states['all'][] = $name;
-                if ($state->visible_on_front){
+                $isVisibleOnFront = (string)$state->visible_on_front;
+                if ((bool)$isVisibleOnFront || ($state->visible_on_front && $isVisibleOnFront == '')) {
                     $this->_states['visible'][] = $name;
                 }
                 else {
diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
index 44d358f324..46d8312b37 100644
--- a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
+++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
@@ -245,8 +245,12 @@ public function canVoid()
     public function refund()
     {
         $this->setState(self::STATE_REFUNDED);
-        $orderRefund = Mage::app()->getStore()->roundPrice($this->getOrder()->getTotalRefunded()+$this->getGrandTotal());
-        $baseOrderRefund = Mage::app()->getStore()->roundPrice($this->getOrder()->getBaseTotalRefunded()+$this->getBaseGrandTotal());
+        $orderRefund = Mage::app()->getStore()->roundPrice(
+            $this->getOrder()->getTotalRefunded()+$this->getGrandTotal()
+        );
+        $baseOrderRefund = Mage::app()->getStore()->roundPrice(
+            $this->getOrder()->getBaseTotalRefunded()+$this->getBaseGrandTotal()
+        );
 
         if ($baseOrderRefund > Mage::app()->getStore()->roundPrice($this->getOrder()->getBaseTotalPaid())) {
 
@@ -331,13 +335,17 @@ public function cancel()
             );
         }
 
-        $this->getOrder()->setBaseSubtotalRefunded($this->getOrder()->getBaseSubtotalRefunded()-$this->getBaseSubtotal());
+        $this->getOrder()->setBaseSubtotalRefunded(
+            $this->getOrder()->getBaseSubtotalRefunded()-$this->getBaseSubtotal()
+        );
         $this->getOrder()->setSubtotalRefunded($this->getOrder()->getSubtotalRefunded()-$this->getSubtotal());
 
         $this->getOrder()->setBaseTaxRefunded($this->getOrder()->getBaseTaxRefunded()-$this->getBaseTaxAmount());
         $this->getOrder()->setTaxRefunded($this->getOrder()->getTaxRefunded()-$this->getTaxAmount());
 
-        $this->getOrder()->setBaseShippingRefunded($this->getOrder()->getBaseShippingRefunded()-$this->getBaseShippingAmount());
+        $this->getOrder()->setBaseShippingRefunded(
+            $this->getOrder()->getBaseShippingRefunded()-$this->getBaseShippingAmount()
+        );
         $this->getOrder()->setShippingRefunded($this->getOrder()->getShippingRefunded()-$this->getShippingAmount());
 
         Mage::dispatchEvent('sales_order_creditmemo_cancel', array($this->_eventObject=>$this));
@@ -513,6 +521,7 @@ public function addComment($comment, $notify=false, $visibleOnFront=false)
         if (!$comment->getId()) {
             $this->getCommentsCollection()->addItem($comment);
         }
+        $this->_hasDataChanges = true;
         return $this;
     }
 
@@ -523,7 +532,8 @@ public function getCommentsCollection($reload=false)
                 ->setCreditmemoFilter($this->getId())
                 ->setCreatedAtOrder();
             /**
-             * When credit memo created with adding comment, comments collection must be loaded before we added this comment.
+             * When credit memo created with adding comment,
+             * comments collection must be loaded before we added this comment.
              */
             $this->_comments->load();
 
@@ -623,6 +633,8 @@ public function sendEmail($notifyCustomer = true, $comment = '')
             )
         );
         $mailer->send();
+        $this->setEmailSent(true);
+        $this->_getResource()->saveAttribute($this, 'email_sent');
 
         return $this;
     }
diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php
index bc9d55226b..2f1d249e64 100644
--- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php
+++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php
@@ -87,8 +87,11 @@ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo)
             }
         } else {
             if ($baseShipping != 0) {
-                $shippingInclTax    = Mage::app()->getStore()->roundPrice($shippingInclTax * $allowedAmount/$shipping);
-                $baseShippingInclTax= Mage::app()->getStore()->roundPrice($baseShippingInclTax * $baseAllowedAmount/$baseShipping);
+                $allowedTaxAmount = $order->getShippingTaxAmount() - $order->getShippingTaxRefunded();
+                $baseAllowedTaxAmount = $order->getBaseShippingTaxAmount() - $order->getBaseShippingTaxRefunded();
+
+                $shippingInclTax = Mage::app()->getStore()->roundPrice($allowedAmount + $allowedTaxAmount);
+                $baseShippingInclTax = Mage::app()->getStore()->roundPrice($baseAllowedAmount + $baseAllowedTaxAmount);
             }
             $shipping           = $allowedAmount;
             $baseShipping       = $baseAllowedAmount;
diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Order/Invoice.php
index baad247bf9..6970badf41 100644
--- a/app/code/core/Mage/Sales/Model/Order/Invoice.php
+++ b/app/code/core/Mage/Sales/Model/Order/Invoice.php
@@ -385,6 +385,11 @@ public function collectTotals()
         return $this;
     }
 
+    /**
+     * Get invoice items collection
+     *
+     * @return Mage_Sales_Model_Mysql4_Order_Invoice_Item_Collection
+     */
     public function getItemsCollection()
     {
         if (empty($this->_items)) {
@@ -582,6 +587,7 @@ public function addComment($comment, $notify=false, $visibleOnFront=false)
         if (!$comment->getId()) {
             $this->getCommentsCollection()->addItem($comment);
         }
+        $this->_hasDataChanges = true;
         return $this;
     }
 
@@ -592,7 +598,8 @@ public function getCommentsCollection($reload=false)
                 ->setInvoiceFilter($this->getId())
                 ->setCreatedAtOrder();
             /**
-             * When invoice created with adding comment, comments collection must be loaded before we added this comment.
+             * When invoice created with adding comment, comments collection
+             * must be loaded before we added this comment.
              */
             $this->_comments->load();
 
@@ -691,6 +698,8 @@ public function sendEmail($notifyCustomer = true, $comment = '')
             )
         );
         $mailer->send();
+        $this->setEmailSent(true);
+        $this->_getResource()->saveAttribute($this, 'email_sent');
 
         return $this;
     }
diff --git a/app/code/core/Mage/Sales/Model/Order/Payment.php b/app/code/core/Mage/Sales/Model/Order/Payment.php
index 0fb24d71c7..cfb72df328 100644
--- a/app/code/core/Mage/Sales/Model/Order/Payment.php
+++ b/app/code/core/Mage/Sales/Model/Order/Payment.php
@@ -259,13 +259,19 @@ public function capture($invoice)
         $this->_isCaptureFinal($paidWorkaround);
 
         if (!$this->getParentTransactionId()) {
-            $orderingTransaction = $this->_lookupTransaction(false, Mage_Sales_Model_Order_Payment_Transaction::TYPE_ORDER);
+            $orderingTransaction = $this->_lookupTransaction(
+                false,
+                Mage_Sales_Model_Order_Payment_Transaction::TYPE_ORDER
+            );
             if ($orderingTransaction) {
                 $this->setParentTransactionId($orderingTransaction->getTxnId());
             }
         }
 
-        $this->_generateTransactionId(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE, $this->getAuthorizationTransaction());
+        $this->_generateTransactionId(
+            Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE,
+            $this->getAuthorizationTransaction()
+        );
 
         Mage::dispatchEvent('sales_order_payment_capture', array('payment' => $this, 'invoice' => $invoice));
 
@@ -274,14 +280,20 @@ public function capture($invoice)
          * Capture attempt will happen only when invoice is not yet paid and the transaction can be paid
          */
         if ($invoice->getTransactionId()) {
-            $this->getMethodInstance()->setStore($order->getStoreId())->fetchTransactionInfo($this, $invoice->getTransactionId());
+            $this->getMethodInstance()
+                ->setStore($order->getStoreId())
+                ->fetchTransactionInfo($this, $invoice->getTransactionId());
         }
         $status = true;
         if (!$invoice->getIsPaid() && !$this->getIsTransactionPending()) {
             // attempt to capture: this can trigger "is_transaction_pending"
             $this->getMethodInstance()->setStore($order->getStoreId())->capture($this, $amountToCapture);
 
-            $transaction = $this->_addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE, $invoice, true);
+            $transaction = $this->_addTransaction(
+                Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE,
+                $invoice,
+                true
+            );
 
             if ($this->getIsTransactionPending()) {
                 $message = Mage::helper('sales')->__('Capturing amount of %s is pending approval on gateway.', $this->_formatPrice($amountToCapture));
@@ -543,7 +555,11 @@ public function refund($creditmemo)
         ));
 
         // update transactions and order state
-        $transaction = $this->_addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_REFUND, $creditmemo, $isOnline);
+        $transaction = $this->_addTransaction(
+            Mage_Sales_Model_Order_Payment_Transaction::TYPE_REFUND,
+            $creditmemo,
+            $isOnline
+        );
         if ($invoice) {
             $message = Mage::helper('sales')->__('Refunded amount of %s online.', $this->_formatPrice($baseAmountToRefund));
         } else {
@@ -572,6 +588,7 @@ public function refund($creditmemo)
      */
     public function registerRefundNotification($amount)
     {
+        $notificationAmount = $amount;
         $this->_generateTransactionId(Mage_Sales_Model_Order_Payment_Transaction::TYPE_REFUND,
             $this->_lookupTransaction($this->getParentTransactionId())
         );
@@ -581,23 +598,46 @@ public function registerRefundNotification($amount)
         $order = $this->getOrder();
         $invoice = $this->_getInvoiceForTransactionId($this->getParentTransactionId());
 
-        $baseGrandTotal = ($invoice) ? $invoice->getBaseGrandTotal() : $order->getBaseGrandTotal();
-        $amountRefundLeft = $baseGrandTotal - $order->getBaseTotalRefunded();
+        if ($invoice) {
+            $baseGrandTotal = $invoice->getBaseGrandTotal();
+            $amountRefundLeft = $baseGrandTotal - $invoice->getBaseTotalRefunded();
+        } else {
+            $baseGrandTotal = $order->getBaseGrandTotal();
+            $amountRefundLeft = $baseGrandTotal - $order->getBaseTotalRefunded();
+        }
+
         if ($amountRefundLeft < $amount) {
             $amount = $amountRefundLeft;
         }
 
-        if ($order->getBaseTotalRefunded() > 0) {
-            $adjustment = array('adjustment_positive' => $amount);
-        } else {
-            $adjustment = array('adjustment_negative' => $baseGrandTotal - $amount);
+        if ($amount <= 0) {
+            $order->addStatusHistoryComment(Mage::helper('sales')->__('IPN "Refunded". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: "%s"', $this->_formatPrice($notificationAmount), $this->getTransactionId()), false);
+            return $this;
         }
 
         $serviceModel = Mage::getModel('sales/service_order', $order);
         if ($invoice) {
+            if ($invoice->getBaseTotalRefunded() > 0) {
+                $adjustment = array('adjustment_positive' => $amount);
+            } else {
+                $adjustment = array('adjustment_negative' => $baseGrandTotal - $amount);
+            }
             $creditmemo = $serviceModel->prepareInvoiceCreditmemo($invoice, $adjustment);
+            if ($creditmemo) {
+                $totalRefunded = $invoice->getBaseTotalRefunded() + $creditmemo->getBaseGrandTotal();
+                $this->setShouldCloseParentTransaction($invoice->getBaseGrandTotal() <= $totalRefunded);
+            }
         } else {
+            if ($order->getBaseTotalRefunded() > 0) {
+                $adjustment = array('adjustment_positive' => $amount);
+            } else {
+                $adjustment = array('adjustment_negative' => $baseGrandTotal - $amount);
+            }
             $creditmemo = $serviceModel->prepareCreditmemo($adjustment);
+            if ($creditmemo) {
+                $totalRefunded = $order->getBaseTotalRefunded() + $creditmemo->getBaseGrandTotal();
+                $this->setShouldCloseParentTransaction($order->getBaseGrandTotal() <= $totalRefunded);
+            }
         }
 
         $creditmemo->setPaymentRefundDisallowed(true)
@@ -758,7 +798,9 @@ public function registerPaymentReviewAction($action, $isOnline)
                 break;
             case self::REVIEW_ACTION_UPDATE:
                 if ($isOnline) {
-                    $this->getMethodInstance()->setStore($order->getStoreId())->fetchTransactionInfo($this, $transactionId);
+                    $this->getMethodInstance()
+                        ->setStore($order->getStoreId())
+                        ->fetchTransactionInfo($this, $transactionId);
                 } else {
                     // notification mechanism is responsible to update the payment object first
                 }
@@ -862,7 +904,10 @@ protected function _authorize($isOnline, $amount)
             // invoke authorization on gateway
             $this->getMethodInstance()->setStore($order->getStoreId())->authorize($this, $amount);
         } else {
-            $message = Mage::helper('sales')->__('Registered notification about authorized amount of %s.', $this->_formatPrice($amount));
+            $message = Mage::helper('sales')->__(
+                'Registered notification about authorized amount of %s.',
+                $this->_formatPrice($amount)
+            );
         }
 
         // similar logic of "payment review" order as in capturing
@@ -960,9 +1005,11 @@ protected function _void($isOnline, $amount = null, $gatewayCallback = 'void')
 //    }
 
     /**
-     * Create transaction, prepare its insertion into hierarchy and add its information to payment and comments
+     * Create transaction,
+     * prepare its insertion into hierarchy and add its information to payment and comments
      *
-     * To add transactions and related information, the following information should be set to payment before processing:
+     * To add transactions and related information,
+     * the following information should be set to payment before processing:
      * - transaction_id
      * - is_transaction_closed (optional) - whether transaction should be closed or open (closed by default)
      * - parent_transaction_id (optional)
@@ -1164,8 +1211,9 @@ protected function _prependMessage($messagePrependTo)
         if ($preparedMessage) {
             if (is_string($preparedMessage)) {
                 return $preparedMessage . ' ' . $messagePrependTo;
-            }
-            elseif (is_object($preparedMessage) && ($preparedMessage instanceof Mage_Sales_Model_Order_Status_History)) {
+            } elseif (is_object($preparedMessage)
+                && ($preparedMessage instanceof Mage_Sales_Model_Order_Status_History)
+            ) {
                 $comment = $preparedMessage->getComment() . ' ' . $messagePrependTo;
                 $preparedMessage->setComment($comment);
                 return $comment;
@@ -1183,8 +1231,8 @@ protected function _prependMessage($messagePrependTo)
      */
     protected function _formatAmount($amount, $asFloat = false)
     {
-        $amount = sprintf('%.2F', $amount); // "f" depends on locale, "F" doesn't
-        return $asFloat ? (float)$amount : $amount;
+         $amount = Mage::app()->getStore()->roundPrice($amount);
+         return !$asFloat ? (string)$amount : $amount;
     }
 
     /**
@@ -1370,7 +1418,9 @@ protected function _getInvoiceForTransactionId($transactionId)
             }
         }
         foreach ($this->getOrder()->getInvoiceCollection() as $invoice) {
-            if ($invoice->getState() == Mage_Sales_Model_Order_Invoice::STATE_OPEN && $invoice->load($invoice->getId())) {
+            if ($invoice->getState() == Mage_Sales_Model_Order_Invoice::STATE_OPEN
+                && $invoice->load($invoice->getId())
+            ) {
                 $invoice->setTransactionId($transactionId);
                 return $invoice;
             }
diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Shipment.php
index e20ba7b510..c4115d296a 100644
--- a/app/code/core/Mage/Sales/Model/Order/Shipment.php
+++ b/app/code/core/Mage/Sales/Model/Order/Shipment.php
@@ -298,6 +298,7 @@ public function addComment($comment, $notify=false, $visibleOnFront=false)
         if (!$comment->getId()) {
             $this->getCommentsCollection()->addItem($comment);
         }
+        $this->_hasDataChanges = true;
         return $this;
     }
 
@@ -309,7 +310,8 @@ public function getCommentsCollection($reload=false)
                 ->setCreatedAtOrder();
 
             /**
-             * When shipment created with adding comment, comments collection must be loaded before we added this comment.
+             * When shipment created with adding comment,
+             * comments collection must be loaded before we added this comment.
              */
             $this->_comments->load();
 
diff --git a/app/code/core/Mage/Sales/Model/Quote.php b/app/code/core/Mage/Sales/Model/Quote.php
index dbab578a9f..54414cc945 100644
--- a/app/code/core/Mage/Sales/Model/Quote.php
+++ b/app/code/core/Mage/Sales/Model/Quote.php
@@ -360,13 +360,14 @@ public function getCustomerGroupId()
     public function getCustomerTaxClassId()
     {
         /*
-        * tax class can vary at any time. so instead of using the value from session, we need to retrieve from db everytime
-        * to get the correct tax class
+        * tax class can vary at any time. so instead of using the value from session,
+        * we need to retrieve from db everytime to get the correct tax class
         */
         //if (!$this->getData('customer_group_id') && !$this->getData('customer_tax_class_id')) {
-            $classId = Mage::getModel('customer/group')->getTaxClassId($this->getCustomerGroupId());
-            $this->setCustomerTaxClassId($classId);
+        $classId = Mage::getModel('customer/group')->getTaxClassId($this->getCustomerGroupId());
+        $this->setCustomerTaxClassId($classId);
         //}
+
         return $this->getData('customer_tax_class_id');
     }
 
@@ -673,6 +674,7 @@ public function getItemById($itemId)
     public function removeItem($itemId)
     {
         $item = $this->getItemById($itemId);
+
         if ($item) {
             $item->setQuote($this);
             /**
@@ -685,8 +687,15 @@ public function removeItem($itemId)
                     $child->isDeleted(true);
                 }
             }
+
+            $parent = $item->getParentItem();
+            if ($parent) {
+                $parent->isDeleted(true);
+            }
+
             Mage::dispatchEvent('sales_quote_remove_item', array('quote_item' => $item));
         }
+
         return $this;
     }
 
@@ -707,7 +716,9 @@ public function addItem(Mage_Sales_Model_Quote_Item $item)
          * Proper solution is to submit items one by one with customer confirmation each time.
          */
         if ($item->isNominal() && $this->hasItems() || $this->hasNominalItems()) {
-            Mage::throwException(Mage::helper('sales')->__('Nominal item can be purchased standalone only. To proceed please remove other items from the quote.'));
+            Mage::throwException(
+                Mage::helper('sales')->__('Nominal item can be purchased standalone only. To proceed please remove other items from the quote.')
+            );
         }
 
         $item->setQuote($this);
@@ -807,7 +818,11 @@ public function addProductAdvanced(Mage_Catalog_Model_Product $product, $request
      */
     public function addProduct(Mage_Catalog_Model_Product $product, $request = null)
     {
-        return $this->addProductAdvanced($product, $request, Mage_Catalog_Model_Product_Type_Abstract::PROCESS_MODE_FULL);
+        return $this->addProductAdvanced(
+            $product,
+            $request,
+            Mage_Catalog_Model_Product_Type_Abstract::PROCESS_MODE_FULL
+        );
     }
 
     /**
@@ -1098,14 +1113,18 @@ public function collectTotals()
 
             $address->collectTotals();
 
-            $this->setSubtotal((float) $this->getSubtotal()+$address->getSubtotal());
-            $this->setBaseSubtotal((float) $this->getBaseSubtotal()+$address->getBaseSubtotal());
+            $this->setSubtotal((float) $this->getSubtotal() + $address->getSubtotal());
+            $this->setBaseSubtotal((float) $this->getBaseSubtotal() + $address->getBaseSubtotal());
 
-            $this->setSubtotalWithDiscount((float) $this->getSubtotalWithDiscount()+$address->getSubtotalWithDiscount());
-            $this->setBaseSubtotalWithDiscount((float) $this->getBaseSubtotalWithDiscount()+$address->getBaseSubtotalWithDiscount());
+            $this->setSubtotalWithDiscount(
+                (float) $this->getSubtotalWithDiscount() + $address->getSubtotalWithDiscount()
+            );
+            $this->setBaseSubtotalWithDiscount(
+                (float) $this->getBaseSubtotalWithDiscount() + $address->getBaseSubtotalWithDiscount()
+            );
 
-            $this->setGrandTotal((float) $this->getGrandTotal()+$address->getGrandTotal());
-            $this->setBaseGrandTotal((float) $this->getBaseGrandTotal()+$address->getBaseGrandTotal());
+            $this->setGrandTotal((float) $this->getGrandTotal() + $address->getGrandTotal());
+            $this->setBaseGrandTotal((float) $this->getBaseGrandTotal() + $address->getBaseGrandTotal());
         }
 
         Mage::helper('sales')->checkQuoteAmount($this, $this->getGrandTotal());
@@ -1120,7 +1139,8 @@ public function collectTotals()
                 continue;
             }
 
-            if (($children = $item->getChildren()) && $item->isShipSeparately()) {
+            $children = $item->getChildren();
+            if ($children && $item->isShipSeparately()) {
                 foreach ($children as $child) {
                     if ($child->getProduct()->getIsVirtual()) {
                         $this->setVirtualItemsQty($this->getVirtualItemsQty() + $child->getQty()*$item->getQty());
@@ -1140,9 +1160,7 @@ public function collectTotals()
 
         Mage::dispatchEvent(
             $this->_eventPrefix . '_collect_totals_after',
-            array(
-                $this->_eventObject=>$this
-            )
+            array($this->_eventObject => $this)
         );
 
         $this->setTotalsCollectedFlag(true);
@@ -1250,18 +1268,19 @@ public function validateMinimumAmount($multishipping = false)
             return true;
         }
 
-        if ($multishipping && !$minOrderMulti) {
-            $baseTotal = 0;
-            foreach ($this->getAllAddresses() as $address) {
-                /* @var $address Mage_Sales_Model_Quote_Address */
-                $baseTotal += $address->getBaseSubtotalWithDiscount();
-            }
+        if ($multishipping) {
+            if ($minOrderMulti) {
+                $baseTotal = 0;
+                foreach ($this->getAllAddresses() as $address) {
+                    /* @var $address Mage_Sales_Model_Quote_Address */
+                    $baseTotal += $address->getBaseSubtotalWithDiscount();
+                }
 
-            if ($baseTotal < Mage::getStoreConfig('sales/minimum_order/amount', $storeId)) {
-                return false;
+                if ($baseTotal < Mage::getStoreConfig('sales/minimum_order/amount', $storeId)) {
+                    return false;
+                }
             }
-        }
-        else {
+        } else {
             foreach ($this->getAllAddresses() as $address) {
                 /* @var $address Mage_Sales_Model_Quote_Address */
                 if (!$address->validateMinimumAmount()) {
@@ -1452,7 +1471,8 @@ public function prepareRecurringPaymentProfiles()
         foreach ($this->getAllVisibleItems() as $item) {
             $product = $item->getProduct();
             if (is_object($product) && ($product->isRecurring())
-                && $profile = Mage::getModel('sales/recurring_profile')->importProduct($product)) {
+                && $profile = Mage::getModel('sales/recurring_profile')->importProduct($product)
+            ) {
                 $profile->importQuote($this);
                 $profile->importQuoteItem($item);
                 $result[] = $profile;
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address.php b/app/code/core/Mage/Sales/Model/Quote/Address.php
index 367f4f452e..d0f6bbb678 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Address.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Address.php
@@ -118,6 +118,11 @@ protected function _beforeSave()
                 $this->setCustomerAddressId($this->getCustomerAddress()->getId());
             }
         }
+        if ($this->getAddressType() == Mage_Sales_Model_Quote_Address::TYPE_SHIPPING
+            && $this->getSameAsBilling() === null
+        ) {
+            $this->setSameAsBilling(1);
+        }
         return $this;
     }
 
@@ -258,9 +263,11 @@ public function getItemsCollection()
     public function getAllItems()
     {
         // We calculate item list once and cache it in three arrays - all items, nominal, non-nominal
-        $key = 'cached_items_' . ($this->_nominalOnly ? 'nominal' : ($this->_nominalOnly === false ? 'nonnominal' : 'all'));
+        $cachedItems = $this->_nominalOnly ? 'nominal' : ($this->_nominalOnly === false ? 'nonnominal' : 'all');
+        $key = 'cached_items_' . $cachedItems;
         if (!$this->hasData($key)) {
-            // For compatibility  we will use $this->_filterNominal to divide nominal items from non-nominal (because it can be overloaded)
+            // For compatibility  we will use $this->_filterNominal to divide nominal items from non-nominal
+            // (because it can be overloaded)
             // So keep current flag $this->_nominalOnly and restore it after cycle
             $wasNominal = $this->_nominalOnly;
             $this->_nominalOnly = true; // Now $this->_filterNominal() will return positive values for nominal items
@@ -295,7 +302,9 @@ public function getAllItems()
                 * For virtual quote we assign items only to billing address, otherwise - only to shipping address
                 */
                 $addressType = $this->getAddressType();
-                $canAddItems = $this->getQuote()->isVirtual() ? ($addressType == self::TYPE_BILLING) : ($addressType == self::TYPE_SHIPPING);
+                $canAddItems = $this->getQuote()->isVirtual()
+                    ? ($addressType == self::TYPE_BILLING)
+                    : ($addressType == self::TYPE_SHIPPING);
 
                 if ($canAddItems) {
                     foreach ($quoteItems as $qItem) {
@@ -716,14 +725,20 @@ public function requestShippingRates(Mage_Sales_Model_Quote_Item_Abstract $item
         $request->setDestCity($this->getCity());
         $request->setDestPostcode($this->getPostcode());
         $request->setPackageValue($item ? $item->getBaseRowTotal() : $this->getBaseSubtotal());
-        $request->setPackageValueWithDiscount($item ? $item->getBaseRowTotal() - $item->getBaseDiscountAmount() : $this->getBaseSubtotalWithDiscount());
+        $packageValueWithDiscount = $item
+            ? $item->getBaseRowTotal() - $item->getBaseDiscountAmount()
+            : $this->getBaseSubtotalWithDiscount();
+        $request->setPackageValueWithDiscount($packageValueWithDiscount);
         $request->setPackageWeight($item ? $item->getRowWeight() : $this->getWeight());
         $request->setPackageQty($item ? $item->getQty() : $this->getItemQty());
 
         /**
          * Need for shipping methods that use insurance based on price of physical products
          */
-        $request->setPackagePhysicalValue($item ? $item->getBaseRowTotal() : $this->getBaseSubtotal() - $this->getBaseVirtualAmount());
+        $packagePhysicalValue = $item
+            ? $item->getBaseRowTotal()
+            : $this->getBaseSubtotal() - $this->getBaseVirtualAmount();
+        $request->setPackagePhysicalValue($packagePhysicalValue);
 
         $request->setFreeMethodWeight($item ? 0 : $this->getFreeMethodWeight());
 
diff --git a/app/code/core/Mage/Sales/Model/Recurring/Profile.php b/app/code/core/Mage/Sales/Model/Recurring/Profile.php
index ed5092b724..00083f4e7b 100644
--- a/app/code/core/Mage/Sales/Model/Recurring/Profile.php
+++ b/app/code/core/Mage/Sales/Model/Recurring/Profile.php
@@ -266,7 +266,7 @@ public function createOrder()
         foreach ($transferDataKays as $key) {
             if (isset($orderInfo[$key])) {
                 $order->setData($key, $orderInfo[$key]);
-            } elseif ($shippingInfo[$key]) {
+            } elseif (isset($shippingInfo[$key])) {
                 $order->setData($key, $shippingInfo[$key]);
             }
         }
diff --git a/app/code/core/Mage/Sales/Model/Service/Order.php b/app/code/core/Mage/Sales/Model/Service/Order.php
index 13fb1a5630..f766b5b014 100644
--- a/app/code/core/Mage/Sales/Model/Service/Order.php
+++ b/app/code/core/Mage/Sales/Model/Service/Order.php
@@ -92,7 +92,7 @@ public function prepareInvoice($qtys = array())
             }
             $item = $this->_convertor->itemToInvoiceItem($orderItem);
             if ($orderItem->isDummy()) {
-                $qty = 1;
+                $qty = $orderItem->getQtyOrdered() ? $orderItem->getQtyOrdered() : 1;
             } else {
                 if (isset($qtys[$orderItem->getId()])) {
                     $qty = (float) $qtys[$orderItem->getId()];
@@ -224,7 +224,7 @@ public function prepareInvoiceCreditmemo($invoice, $data = array())
             if (isset($invoiceQtysRefunded[$orderItemId])) {
                 $invoiceQtyCanBeRefunded = $invoiceQtyCanBeRefunded - $invoiceQtysRefunded[$orderItemId];
             }
-            $invoiceQtysRefundLimits[$orderItemId] = $invoiceQtyCanBeRefunded; 
+            $invoiceQtysRefundLimits[$orderItemId] = $invoiceQtyCanBeRefunded;
         }
 
 
diff --git a/app/code/core/Mage/Sales/Model/Service/Quote.php b/app/code/core/Mage/Sales/Model/Service/Quote.php
index 225be103a7..5729f4206a 100644
--- a/app/code/core/Mage/Sales/Model/Service/Quote.php
+++ b/app/code/core/Mage/Sales/Model/Service/Quote.php
@@ -184,6 +184,15 @@ public function submitOrder()
             $this->_inactivateQuote();
             Mage::dispatchEvent('sales_model_service_quote_submit_success', array('order'=>$order, 'quote'=>$quote));
         } catch (Exception $e) {
+
+            //reset order ID's on exception, because order not saved
+            $order->setId(null);
+            /** @var $item Mage_Sales_Model_Order_Item */
+            foreach ($order->getItemsCollection() as $item) {
+                $item->setOrderId(null);
+                $item->setItemId(null);
+            }
+
             Mage::dispatchEvent('sales_model_service_quote_submit_failure', array('order'=>$order, 'quote'=>$quote));
             throw $e;
         }
diff --git a/app/code/core/Mage/Sales/etc/api.xml b/app/code/core/Mage/Sales/etc/api.xml
index e7b35e89f9..207db1ff16 100644
--- a/app/code/core/Mage/Sales/etc/api.xml
+++ b/app/code/core/Mage/Sales/etc/api.xml
@@ -177,7 +177,7 @@
                 <faults module="sales">
                     <not_exists>
                         <code>100</code>
-                        <message>Requested shipment not exists.</message>
+                        <message>Requested invoice does not exist.</message>
                     </not_exists>
                     <filters_invalid>
                         <code>101</code>
diff --git a/app/code/core/Mage/Sales/etc/config.xml b/app/code/core/Mage/Sales/etc/config.xml
index deb379e50a..d7a000d188 100644
--- a/app/code/core/Mage/Sales/etc/config.xml
+++ b/app/code/core/Mage/Sales/etc/config.xml
@@ -654,7 +654,7 @@
                         <statuses>
                             <pending default="1"/>
                         </statuses>
-                        <visible_on_front/>
+                        <visible_on_front>1</visible_on_front>
                     </new>
                     <pending_payment translate="label">
                         <label>Pending Payment</label>
@@ -667,35 +667,35 @@
                         <statuses>
                             <processing default="1"/>
                         </statuses>
-                        <visible_on_front/>
+                        <visible_on_front>1</visible_on_front>
                     </processing>
                     <complete translate="label">
                         <label>Complete</label>
                         <statuses>
                             <complete default="1"/>
                         </statuses>
-                        <visible_on_front/>
+                        <visible_on_front>1</visible_on_front>
                     </complete>
                     <closed translate="label">
                         <label>Closed</label>
                         <statuses>
                             <closed default="1"/>
                         </statuses>
-                        <visible_on_front/>
+                        <visible_on_front>1</visible_on_front>
                     </closed>
                     <canceled translate="label">
                         <label>Canceled</label>
                         <statuses>
                             <canceled default="1"/>
                         </statuses>
-                        <visible_on_front/>
+                        <visible_on_front>1</visible_on_front>
                     </canceled>
                     <holded translate="label">
                         <label>On Hold</label>
                         <statuses>
                             <holded default="1"/>
                         </statuses>
-                        <visible_on_front/>
+                        <visible_on_front>1</visible_on_front>
                     </holded>
                     <payment_review translate="label">
                         <label>Payment Review</label>
@@ -703,7 +703,7 @@
                             <payment_review default="1"/>
                             <fraud/>
                         </statuses>
-                        <visible_on_front/>
+                        <visible_on_front>1</visible_on_front>
                     </payment_review>
                 </states>
             </order>
diff --git a/app/code/core/Mage/Sales/etc/wsdl.xml b/app/code/core/Mage/Sales/etc/wsdl.xml
index 5da6c65335..2ed242078e 100644
--- a/app/code/core/Mage/Sales/etc/wsdl.xml
+++ b/app/code/core/Mage/Sales/etc/wsdl.xml
@@ -81,10 +81,185 @@
                     <element name="status_history" type="typens:salesOrderStatusHistoryEntityArray" minOccurs="0" />
                 </all>
             </complexType>
-            <complexType name="salesOrderEntityArray">
+            <complexType name="salesOrderListEntity">
+                <all>
+                    <element name="increment_id" type="xsd:string" minOccurs="0" />
+                    <element name="store_id" type="xsd:string" minOccurs="0" />
+                    <element name="created_at" type="xsd:string" minOccurs="0" />
+                    <element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <element name="customer_id" type="xsd:string" minOccurs="0" />
+                    <element name="tax_amount" type="xsd:string" minOccurs="0" />
+                    <element name="shipping_amount" type="xsd:string" minOccurs="0" />
+                    <element name="discount_amount" type="xsd:string" minOccurs="0" />
+                    <element name="subtotal" type="xsd:string" minOccurs="0" />
+                    <element name="grand_total" type="xsd:string" minOccurs="0" />
+                    <element name="total_paid" type="xsd:string" minOccurs="0" />
+                    <element name="total_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="total_qty_ordered" type="xsd:string" minOccurs="0" />
+                    <element name="total_canceled" type="xsd:string" minOccurs="0" />
+                    <element name="total_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="total_online_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="total_offline_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="base_tax_amount" type="xsd:string" minOccurs="0" />
+                    <element name="base_shipping_amount" type="xsd:string" minOccurs="0" />
+                    <element name="base_discount_amount" type="xsd:string" minOccurs="0" />
+                    <element name="base_subtotal" type="xsd:string" minOccurs="0" />
+                    <element name="base_grand_total" type="xsd:string" minOccurs="0" />
+                    <element name="base_total_paid" type="xsd:string" minOccurs="0" />
+                    <element name="base_total_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="base_total_qty_ordered" type="xsd:string" minOccurs="0" />
+                    <element name="base_total_canceled" type="xsd:string" minOccurs="0" />
+                    <element name="base_total_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="base_total_online_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="base_total_offline_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="billing_address_id" type="xsd:string" minOccurs="0" />
+                    <element name="billing_firstname" type="xsd:string" minOccurs="0" />
+                    <element name="billing_lastname" type="xsd:string" minOccurs="0" />
+                    <element name="shipping_address_id" type="xsd:string" minOccurs="0" />
+                    <element name="shipping_firstname" type="xsd:string" minOccurs="0" />
+                    <element name="shipping_lastname" type="xsd:string" minOccurs="0" />
+                    <element name="billing_name" type="xsd:string" minOccurs="0" />
+                    <element name="shipping_name" type="xsd:string" minOccurs="0" />
+                    <element name="store_to_base_rate" type="xsd:string" minOccurs="0" />
+                    <element name="store_to_order_rate" type="xsd:string" minOccurs="0" />
+                    <element name="base_to_global_rate" type="xsd:string" minOccurs="0" />
+                    <element name="base_to_order_rate" type="xsd:string" minOccurs="0" />
+                    <element name="weight" type="xsd:string" minOccurs="0" />
+                    <element name="store_name" type="xsd:string" minOccurs="0" />
+                    <element name="remote_ip" type="xsd:string" minOccurs="0" />
+                    <element name="status" type="xsd:string" minOccurs="0" />
+                    <element name="state" type="xsd:string" minOccurs="0" />
+                    <element name="applied_rule_ids" type="xsd:string" minOccurs="0" />
+                    <element name="global_currency_code" type="xsd:string" minOccurs="0" />
+                    <element name="base_currency_code" type="xsd:string" minOccurs="0" />
+                    <element name="store_currency_code" type="xsd:string" minOccurs="0" />
+                    <element name="order_currency_code" type="xsd:string" minOccurs="0" />
+                    <element name="shipping_method" type="xsd:string" minOccurs="0" />
+                    <element name="shipping_description" type="xsd:string" minOccurs="0" />
+                    <element name="customer_email" type="xsd:string" minOccurs="0" />
+                    <element name="customer_firstname" type="xsd:string" minOccurs="0" />
+                    <element name="customer_lastname" type="xsd:string" minOccurs="0" />
+                    <element name="quote_id" type="xsd:string" minOccurs="0" />
+                    <element name="is_virtual" type="xsd:string" minOccurs="0" />
+                    <element name="customer_group_id" type="xsd:string" minOccurs="0" />
+                    <element name="customer_note_notify" type="xsd:string" minOccurs="0" />
+                    <element name="customer_is_guest" type="xsd:string" minOccurs="0" />
+                    <element name="email_sent" type="xsd:string" minOccurs="0" />
+                    <element name="order_id" type="xsd:string" minOccurs="0" />
+                    <element name="gift_message_id" type="xsd:string" minOccurs="0" />
+                    <element name="coupon_code" type="xsd:string" minOccurs="0" />
+                    <element name="protect_code" type="xsd:string" minOccurs="0" />
+                    <element name="base_discount_canceled" type="xsd:string" minOccurs="0" />
+                    <element name="base_discount_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="base_discount_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="base_shipping_canceled" type="xsd:string" minOccurs="0" />
+                    <element name="base_shipping_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="base_shipping_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="base_shipping_tax_amount" type="xsd:string" minOccurs="0" />
+                    <element name="base_shipping_tax_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="base_subtotal_canceled" type="xsd:string" minOccurs="0" />
+                    <element name="base_subtotal_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="base_subtotal_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="base_tax_canceled" type="xsd:string" minOccurs="0" />
+                    <element name="base_tax_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="base_tax_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="base_total_invoiced_cost" type="xsd:string" minOccurs="0" />
+                    <element name="discount_canceled" type="xsd:string" minOccurs="0" />
+                    <element name="discount_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="discount_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="shipping_canceled" type="xsd:string" minOccurs="0" />
+                    <element name="shipping_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="shipping_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="shipping_tax_amount" type="xsd:string" minOccurs="0" />
+                    <element name="shipping_tax_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="subtotal_canceled" type="xsd:string" minOccurs="0" />
+                    <element name="subtotal_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="subtotal_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="tax_canceled" type="xsd:string" minOccurs="0" />
+                    <element name="tax_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="tax_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="can_ship_partially" type="xsd:string" minOccurs="0" />
+                    <element name="can_ship_partially_item" type="xsd:string" minOccurs="0" />
+                    <element name="edit_increment" type="xsd:string" minOccurs="0" />
+                    <element name="forced_do_shipment_with_invoice" type="xsd:string" minOccurs="0" />
+                    <element name="payment_authorization_expiration" type="xsd:string" minOccurs="0" />
+                    <element name="paypal_ipn_customer_notified" type="xsd:string" minOccurs="0" />
+                    <element name="quote_address_id" type="xsd:string" minOccurs="0" />
+                    <element name="adjustment_negative" type="xsd:string" minOccurs="0" />
+                    <element name="adjustment_positive" type="xsd:string" minOccurs="0" />
+                    <element name="base_adjustment_negative" type="xsd:string" minOccurs="0" />
+                    <element name="base_adjustment_positive" type="xsd:string" minOccurs="0" />
+                    <element name="base_shipping_discount_amount" type="xsd:string" minOccurs="0" />
+                    <element name="base_subtotal_incl_tax" type="xsd:string" minOccurs="0" />
+                    <element name="base_total_due" type="xsd:string" minOccurs="0" />
+                    <element name="payment_authorization_amount" type="xsd:string" minOccurs="0" />
+                    <element name="shipping_discount_amount" type="xsd:string" minOccurs="0" />
+                    <element name="subtotal_incl_tax" type="xsd:string" minOccurs="0" />
+                    <element name="total_due" type="xsd:string" minOccurs="0" />
+                    <element name="customer_dob" type="xsd:string" minOccurs="0" />
+                    <element name="customer_middlename" type="xsd:string" minOccurs="0" />
+                    <element name="customer_prefix" type="xsd:string" minOccurs="0" />
+                    <element name="customer_suffix" type="xsd:string" minOccurs="0" />
+                    <element name="customer_taxvat" type="xsd:string" minOccurs="0" />
+                    <element name="discount_description" type="xsd:string" minOccurs="0" />
+                    <element name="ext_customer_id" type="xsd:string" minOccurs="0" />
+                    <element name="ext_order_id" type="xsd:string" minOccurs="0" />
+                    <element name="hold_before_state" type="xsd:string" minOccurs="0" />
+                    <element name="hold_before_status" type="xsd:string" minOccurs="0" />
+                    <element name="original_increment_id" type="xsd:string" minOccurs="0" />
+                    <element name="relation_child_id" type="xsd:string" minOccurs="0" />
+                    <element name="relation_child_real_id" type="xsd:string" minOccurs="0" />
+                    <element name="relation_parent_id" type="xsd:string" minOccurs="0" />
+                    <element name="relation_parent_real_id" type="xsd:string" minOccurs="0" />
+                    <element name="x_forwarded_for" type="xsd:string" minOccurs="0" />
+                    <element name="customer_note" type="xsd:string" minOccurs="0" />
+                    <element name="total_item_count" type="xsd:string" minOccurs="0" />
+                    <element name="customer_gender" type="xsd:string" minOccurs="0" />
+                    <element name="hidden_tax_amount" type="xsd:string" minOccurs="0" />
+                    <element name="base_hidden_tax_amount" type="xsd:string" minOccurs="0" />
+                    <element name="shipping_hidden_tax_amount" type="xsd:string" minOccurs="0" />
+                    <element name="base_shipping_hidden_tax_amount" type="xsd:string" minOccurs="0" />
+                    <element name="hidden_tax_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="base_hidden_tax_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="hidden_tax_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="base_hidden_tax_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="shipping_incl_tax" type="xsd:string" minOccurs="0" />
+                    <element name="base_shipping_incl_tax" type="xsd:string" minOccurs="0" />
+                    <element name="base_customer_balance_amount" type="xsd:string" minOccurs="0" />
+                    <element name="customer_balance_amount" type="xsd:string" minOccurs="0" />
+                    <element name="base_customer_balance_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="customer_balance_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="base_customer_balance_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="customer_balance_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="base_customer_balance_total_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="customer_balance_total_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="gift_cards" type="xsd:string" minOccurs="0" />
+                    <element name="base_gift_cards_amount" type="xsd:string" minOccurs="0" />
+                    <element name="gift_cards_amount" type="xsd:string" minOccurs="0" />
+                    <element name="base_gift_cards_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="gift_cards_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="base_gift_cards_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="gift_cards_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="reward_points_balance" type="xsd:string" minOccurs="0" />
+                    <element name="base_reward_currency_amount" type="xsd:string" minOccurs="0" />
+                    <element name="reward_currency_amount" type="xsd:string" minOccurs="0" />
+                    <element name="base_reward_currency_amount_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="reward_currency_amount_invoiced" type="xsd:string" minOccurs="0" />
+                    <element name="base_reward_currency_amount_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="reward_currency_amount_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="reward_points_balance_refunded" type="xsd:string" minOccurs="0" />
+                    <element name="reward_points_balance_to_refund" type="xsd:string" minOccurs="0" />
+                    <element name="reward_salesrule_points" type="xsd:string" minOccurs="0" />
+                    <element name="firstname" type="xsd:string" minOccurs="0" />
+                    <element name="lastname" type="xsd:string" minOccurs="0" />
+                    <element name="telephone" type="xsd:string" minOccurs="0" />
+                    <element name="postcode" type="xsd:string" minOccurs="0" />
+                </all>
+            </complexType>
+            <complexType name="salesOrderListEntityArray">
                 <complexContent>
                     <restriction base="soapenc:Array">
-                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:salesOrderEntity[]" />
+                        <attribute ref="soapenc:arrayType" wsdl:arrayType="typens:salesOrderListEntity[]" />
                     </restriction>
                 </complexContent>
             </complexType>
@@ -435,7 +610,7 @@
         <part name="filters" type="typens:filters" />
     </message>
     <message name="salesOrderListResponse">
-        <part name="result" type="typens:salesOrderEntityArray" />
+        <part name="result" type="typens:salesOrderListEntityArray" />
     </message>
     <message name="salesOrderInfoRequest">
         <part name="sessionId" type="xsd:string" />
diff --git a/app/code/core/Mage/Sales/etc/wsi.xml b/app/code/core/Mage/Sales/etc/wsi.xml
new file mode 100644
index 0000000000..e48160047d
--- /dev/null
+++ b/app/code/core/Mage/Sales/etc/wsi.xml
@@ -0,0 +1,1321 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:typens="urn:{{var wsdl.name}}"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+             name="{{var wsdl.name}}"
+             targetNamespace="urn:{{var wsdl.name}}">
+    <wsdl:types>
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:{{var wsdl.name}}">
+            <xsd:complexType name="salesOrderEntity">
+                <xsd:sequence>
+                    <xsd:element name="increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="parent_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="store_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_active" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="tax_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="discount_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="subtotal" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="grand_total" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_paid" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_qty_ordered" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_canceled" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_online_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_offline_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_tax_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_shipping_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_discount_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_subtotal" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_grand_total" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_total_paid" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_total_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_total_qty_ordered" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_total_canceled" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_total_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_total_online_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_total_offline_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="billing_address_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="billing_firstname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="billing_lastname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_address_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_firstname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_lastname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="billing_name" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_name" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="store_to_base_rate" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="store_to_order_rate" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_to_global_rate" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_to_order_rate" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="weight" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="store_name" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="remote_ip" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="status" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="state" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="applied_rule_ids" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="global_currency_code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_currency_code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="store_currency_code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="order_currency_code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_method" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_description" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_email" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_firstname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_lastname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="quote_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_virtual" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_group_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_note_notify" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_is_guest" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="email_sent" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="order_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="gift_message_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="gift_message" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_address" type="typens:salesOrderAddressEntity" minOccurs="0" />
+                    <xsd:element name="billing_address" type="typens:salesOrderAddressEntity" minOccurs="0" />
+                    <xsd:element name="items" type="typens:salesOrderItemEntityArray" minOccurs="0" />
+                    <xsd:element name="payment" type="typens:salesOrderPaymentEntity" minOccurs="0" />
+                    <xsd:element name="status_history" type="typens:salesOrderStatusHistoryEntityArray" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderListEntity">
+                <xsd:sequence>
+                    <xsd:element name="increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="store_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="tax_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="discount_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="subtotal" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="grand_total" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_paid" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_qty_ordered" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_canceled" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_online_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_offline_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_tax_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_shipping_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_discount_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_subtotal" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_grand_total" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_total_paid" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_total_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_total_qty_ordered" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_total_canceled" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_total_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_total_online_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_total_offline_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="billing_address_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="billing_firstname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="billing_lastname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_address_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_firstname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_lastname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="billing_name" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_name" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="store_to_base_rate" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="store_to_order_rate" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_to_global_rate" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_to_order_rate" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="weight" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="store_name" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="remote_ip" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="status" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="state" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="applied_rule_ids" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="global_currency_code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_currency_code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="store_currency_code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="order_currency_code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_method" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_description" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_email" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_firstname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_lastname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="quote_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_virtual" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_group_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_note_notify" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_is_guest" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="email_sent" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="order_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="gift_message_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="coupon_code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="protect_code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_discount_canceled" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_discount_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_discount_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_shipping_canceled" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_shipping_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_shipping_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_shipping_tax_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_shipping_tax_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_subtotal_canceled" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_subtotal_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_subtotal_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_tax_canceled" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_tax_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_tax_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_total_invoiced_cost" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="discount_canceled" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="discount_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="discount_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_canceled" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_tax_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_tax_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="subtotal_canceled" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="subtotal_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="subtotal_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="tax_canceled" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="tax_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="tax_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="can_ship_partially" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="can_ship_partially_item" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="edit_increment" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="forced_do_shipment_with_invoice" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="payment_authorization_expiration" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="paypal_ipn_customer_notified" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="quote_address_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="adjustment_negative" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="adjustment_positive" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_adjustment_negative" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_adjustment_positive" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_shipping_discount_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_subtotal_incl_tax" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_total_due" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="payment_authorization_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_discount_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="subtotal_incl_tax" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_due" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_dob" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_middlename" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_prefix" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_suffix" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_taxvat" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="discount_description" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="ext_customer_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="ext_order_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="hold_before_state" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="hold_before_status" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="original_increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="relation_child_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="relation_child_real_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="relation_parent_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="relation_parent_real_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="x_forwarded_for" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_note" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_item_count" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_gender" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="hidden_tax_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_hidden_tax_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_hidden_tax_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_shipping_hidden_tax_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="hidden_tax_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_hidden_tax_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="hidden_tax_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_hidden_tax_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_incl_tax" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_shipping_incl_tax" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_customer_balance_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_balance_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_customer_balance_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_balance_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_customer_balance_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_balance_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_customer_balance_total_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="customer_balance_total_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="gift_cards" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_gift_cards_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="gift_cards_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_gift_cards_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="gift_cards_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_gift_cards_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="gift_cards_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="reward_points_balance" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_reward_currency_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="reward_currency_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_reward_currency_amount_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="reward_currency_amount_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_reward_currency_amount_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="reward_currency_amount_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="reward_points_balance_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="reward_points_balance_to_refund" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="reward_salesrule_points" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="firstname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="lastname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="telephone" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="postcode" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderListEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:salesOrderListEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderAddressEntity">
+                <xsd:sequence>
+                    <xsd:element name="increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="parent_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_active" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="address_type" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="firstname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="lastname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="company" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="street" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="city" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="region" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="postcode" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="country_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="telephone" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="fax" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="region_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="address_id" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderItemEntity">
+                <xsd:sequence>
+                    <xsd:element name="item_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="order_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="quote_item_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="product_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="product_type" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="product_options" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="weight" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_virtual" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="sku" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="name" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="applied_rule_ids" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="free_shipping" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_qty_decimal" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="no_discount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="qty_canceled" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="qty_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="qty_ordered" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="qty_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="qty_shipped" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="cost" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="price" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_price" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="original_price" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_original_price" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="tax_percent" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="tax_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_tax_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="tax_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_tax_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="discount_percent" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="discount_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_discount_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="discount_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_discount_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="amount_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_amount_refunded" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="row_total" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_row_total" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="row_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_row_invoiced" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="row_weight" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="gift_message_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="gift_message" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="gift_message_available" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_tax_before_discount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="tax_before_discount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="weee_tax_applied" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="weee_tax_applied_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="weee_tax_applied_row_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_weee_tax_applied_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_weee_tax_applied_row_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="weee_tax_disposition" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="weee_tax_row_disposition" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_weee_tax_disposition" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_weee_tax_row_disposition" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderItemEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:salesOrderItemEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="orderItemIdQty">
+                <xsd:sequence>
+                    <xsd:element name="order_item_id" type="xsd:int" />
+                    <xsd:element name="qty" type="xsd:double" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="orderItemIdQtyArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:orderItemIdQty" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderPaymentEntity">
+                <xsd:sequence>
+                    <xsd:element name="increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="parent_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_active" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="amount_ordered" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_amount_ordered" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_shipping_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="method" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="po_number" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="cc_type" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="cc_number_enc" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="cc_last4" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="cc_owner" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="cc_exp_month" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="cc_exp_year" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="cc_ss_start_month" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="cc_ss_start_year" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="payment_id" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderStatusHistoryEntity">
+                <xsd:sequence>
+                    <xsd:element name="increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="parent_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_active" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_customer_notified" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="status" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="comment" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderStatusHistoryEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:salesOrderStatusHistoryEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderShipmentEntity">
+                <xsd:sequence>
+                    <xsd:element name="increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="parent_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="store_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_active" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_address_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_firstname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_lastname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="order_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="order_increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="order_created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="total_qty" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="items" type="typens:salesOrderShipmentItemEntityArray" minOccurs="0" />
+                    <xsd:element name="tracks" type="typens:salesOrderShipmentTrackEntityArray" minOccurs="0" />
+                    <xsd:element name="comments" type="typens:salesOrderShipmentCommentEntityArray" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderShipmentEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:salesOrderShipmentEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderShipmentCommentEntity">
+                <xsd:sequence>
+                    <xsd:element name="increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="parent_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_active" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="comment" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_customer_notified" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="comment_id" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderShipmentCommentEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:salesOrderShipmentCommentEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderShipmentTrackEntity">
+                <xsd:sequence>
+                    <xsd:element name="increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="parent_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_active" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="carrier_code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="title" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="number" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="order_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="track_id" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderShipmentTrackEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:salesOrderShipmentTrackEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderShipmentItemEntity">
+                <xsd:sequence>
+                    <xsd:element name="increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="parent_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_active" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="sku" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="name" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="order_item_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="product_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="weight" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="price" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="qty" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="item_id" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderShipmentItemEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:salesOrderShipmentItemEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderInvoiceEntity">
+                <xsd:sequence>
+                    <xsd:element name="increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="parent_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="store_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_active" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="global_currency_code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_currency_code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="store_currency_code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="order_currency_code" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="store_to_base_rate" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="store_to_order_rate" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_to_global_rate" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_to_order_rate" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="subtotal" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_subtotal" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_grand_total" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="discount_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_discount_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="shipping_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_shipping_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="tax_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_tax_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="billing_address_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="billing_firstname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="billing_lastname" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="order_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="order_increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="order_created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="state" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="grand_total" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="invoice_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="items" type="typens:salesOrderInvoiceItemEntityArray" minOccurs="0" />
+                    <xsd:element name="comments" type="typens:salesOrderInvoiceCommentEntityArray" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderInvoiceEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:salesOrderInvoiceEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderInvoiceItemEntity">
+                <xsd:sequence>
+                    <xsd:element name="increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="parent_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_active" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="weee_tax_applied" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="qty" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="cost" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="price" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="tax_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="row_total" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_price" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_tax_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_row_total" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_weee_tax_applied_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_weee_tax_applied_row_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="weee_tax_applied_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="weee_tax_applied_row_amount" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="weee_tax_disposition" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="weee_tax_row_disposition" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_weee_tax_disposition" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="base_weee_tax_row_disposition" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="sku" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="name" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="order_item_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="product_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="item_id" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderInvoiceItemEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:salesOrderInvoiceItemEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderInvoiceCommentEntity">
+                <xsd:sequence>
+                    <xsd:element name="increment_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="parent_id" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="created_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="updated_at" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_active" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="comment" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="is_customer_notified" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="comment_id" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="salesOrderInvoiceCommentEntityArray">
+                <xsd:sequence>
+                    <xsd:element minOccurs="0" maxOccurs="unbounded" name="complexObjectArray" type="typens:salesOrderInvoiceCommentEntity" />
+                </xsd:sequence>
+            </xsd:complexType>
+
+            <xsd:element name="salesOrderListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="filters" type="typens:filters" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:salesOrderListEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderInfoRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="orderIncrementId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderInfoResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:salesOrderEntity" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderAddCommentRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="orderIncrementId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="status" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="comment" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="notify" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderAddCommentResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderHoldRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="orderIncrementId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderHoldResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderUnholdRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="orderIncrementId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderUnholdResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderCancelRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="orderIncrementId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderCancelResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderShipmentListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="filters" type="typens:filters" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderShipmentListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:salesOrderShipmentEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderShipmentInfoRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="shipmentIncrementId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderShipmentInfoResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:salesOrderShipmentEntity" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderShipmentCreateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="orderIncrementId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="itemsQty" type="typens:orderItemIdQtyArray" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="comment" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="email" type="xsd:int" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="includeComment" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderShipmentCreateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderShipmentAddTrackRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="shipmentIncrementId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="carrier" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="title" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="trackNumber" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderShipmentAddTrackResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderShipmentRemoveTrackRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="shipmentIncrementId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="trackId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderShipmentRemoveTrackResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderShipmentAddCommentRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="shipmentIncrementId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="comment" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="email" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="includeInEmail" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderShipmentAddCommentResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:int" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderShipmentGetCarriersRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="orderIncrementId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderShipmentGetCarriersResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:associativeArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderInvoiceListRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="filters" type="typens:filters" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderInvoiceListResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:salesOrderInvoiceEntityArray" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderInvoiceInfoRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="invoiceIncrementId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderInvoiceInfoResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="typens:salesOrderInvoiceEntity" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderInvoiceCreateRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="invoiceIncrementId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="itemsQty" type="typens:orderItemIdQtyArray" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="comment" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="email" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="includeComment" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderInvoiceCreateResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderInvoiceAddCommentRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="invoiceIncrementId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="comment" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="email" type="xsd:string" />
+                        <xsd:element minOccurs="0" maxOccurs="1" name="includeComment" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderInvoiceAddCommentResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderInvoiceCaptureRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="invoiceIncrementId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderInvoiceCaptureResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderInvoiceVoidRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="invoiceIncrementId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderInvoiceVoidResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderInvoiceCancelRequestParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="sessionId" type="xsd:string" />
+                        <xsd:element minOccurs="1" maxOccurs="1" name="invoiceIncrementId" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="salesOrderInvoiceCancelResponseParam">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="1" maxOccurs="1" name="result" type="xsd:string" />
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="salesOrderListRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderListResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderInfoRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderInfoRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderInfoResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderInfoResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderAddCommentRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderAddCommentRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderAddCommentResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderAddCommentResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderHoldRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderHoldRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderHoldResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderHoldResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderUnholdRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderUnholdRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderUnholdResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderUnholdResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderCancelRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderCancelRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderCancelResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderCancelResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderShipmentListRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderShipmentListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderShipmentListResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderShipmentListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderShipmentInfoRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderShipmentInfoRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderShipmentInfoResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderShipmentInfoResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderShipmentCreateRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderShipmentCreateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderShipmentCreateResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderShipmentCreateResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderShipmentAddCommentRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderShipmentAddCommentRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderShipmentAddCommentResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderShipmentAddCommentResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderShipmentAddTrackRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderShipmentAddTrackRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderShipmentAddTrackResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderShipmentAddTrackResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderShipmentRemoveTrackRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderShipmentRemoveTrackRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderShipmentRemoveTrackResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderShipmentRemoveTrackResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderShipmentGetCarriersRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderShipmentGetCarriersRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderShipmentGetCarriersResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderShipmentGetCarriersResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderInvoiceListRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderInvoiceListRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderInvoiceListResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderInvoiceListResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderInvoiceInfoRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderInvoiceInfoRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderInvoiceInfoResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderInvoiceInfoResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderInvoiceCreateRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderInvoiceCreateRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderInvoiceCreateResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderInvoiceCreateResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderInvoiceAddCommentRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderInvoiceAddCommentRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderInvoiceAddCommentResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderInvoiceAddCommentResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderInvoiceCaptureRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderInvoiceCaptureRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderInvoiceCaptureResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderInvoiceCaptureResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderInvoiceVoidRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderInvoiceVoidRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderInvoiceVoidResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderInvoiceVoidResponseParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderInvoiceCancelRequest">
+        <wsdl:part name="parameters" element="typens:salesOrderInvoiceCancelRequestParam" />
+    </wsdl:message>
+    <wsdl:message name="salesOrderInvoiceCancelResponse">
+        <wsdl:part name="parameters" element="typens:salesOrderInvoiceCancelResponseParam" />
+    </wsdl:message>
+    <wsdl:portType name="{{var wsdl.handler}}PortType">
+        <wsdl:operation name="salesOrderList">
+            <wsdl:documentation>Retrieve list of orders by filters</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderListRequest" />
+            <wsdl:output message="typens:salesOrderListResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderInfo">
+            <wsdl:documentation>Retrieve order information</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderInfoRequest" />
+            <wsdl:output message="typens:salesOrderInfoResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderAddComment">
+            <wsdl:documentation>Add comment to order</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderAddCommentRequest" />
+            <wsdl:output message="typens:salesOrderAddCommentResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderHold">
+            <wsdl:documentation>Hold order</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderHoldRequest" />
+            <wsdl:output message="typens:salesOrderHoldResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderUnhold">
+            <wsdl:documentation>Unhold order</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderUnholdRequest" />
+            <wsdl:output message="typens:salesOrderUnholdResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderCancel">
+            <wsdl:documentation>Cancel order</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderCancelRequest" />
+            <wsdl:output message="typens:salesOrderCancelResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderShipmentList">
+            <wsdl:documentation>Retrieve list of shipments by filters</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderShipmentListRequest" />
+            <wsdl:output message="typens:salesOrderShipmentListResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderShipmentInfo">
+            <wsdl:documentation>Retrieve shipment information</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderShipmentInfoRequest" />
+            <wsdl:output message="typens:salesOrderShipmentInfoResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderShipmentCreate">
+            <wsdl:documentation>Create new shipment for order</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderShipmentCreateRequest" />
+            <wsdl:output message="typens:salesOrderShipmentCreateResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderShipmentAddComment">
+            <wsdl:documentation>Add new comment to shipment</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderShipmentAddCommentRequest" />
+            <wsdl:output message="typens:salesOrderShipmentAddCommentResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderShipmentAddTrack">
+            <wsdl:documentation>Add new tracking number</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderShipmentAddTrackRequest" />
+            <wsdl:output message="typens:salesOrderShipmentAddTrackResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderShipmentRemoveTrack">
+            <wsdl:documentation>Remove tracking number</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderShipmentRemoveTrackRequest" />
+            <wsdl:output message="typens:salesOrderShipmentRemoveTrackResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderShipmentGetCarriers">
+            <wsdl:documentation>Retrieve list of allowed carriers for order</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderShipmentGetCarriersRequest" />
+            <wsdl:output message="typens:salesOrderShipmentGetCarriersResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderInvoiceList">
+            <wsdl:documentation>Retrieve list of invoices by filters</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderInvoiceListRequest" />
+            <wsdl:output message="typens:salesOrderInvoiceListResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderInvoiceInfo">
+            <wsdl:documentation>Retrieve invoice information</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderInvoiceInfoRequest" />
+            <wsdl:output message="typens:salesOrderInvoiceInfoResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderInvoiceCreate">
+            <wsdl:documentation>Create new invoice for order</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderInvoiceCreateRequest" />
+            <wsdl:output message="typens:salesOrderInvoiceCreateResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderInvoiceAddComment">
+            <wsdl:documentation>Add new comment to shipment</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderInvoiceAddCommentRequest" />
+            <wsdl:output message="typens:salesOrderInvoiceAddCommentResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderInvoiceCapture">
+            <wsdl:documentation>Capture invoice</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderInvoiceCaptureRequest" />
+            <wsdl:output message="typens:salesOrderInvoiceCaptureResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderInvoiceVoid">
+            <wsdl:documentation>Void invoice</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderInvoiceVoidRequest" />
+            <wsdl:output message="typens:salesOrderInvoiceVoidResponse" />
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderInvoiceCancel">
+            <wsdl:documentation>Cancel invoice</wsdl:documentation>
+            <wsdl:input message="typens:salesOrderInvoiceCancelRequest" />
+            <wsdl:output message="typens:salesOrderInvoiceCancelResponse" />
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="{{var wsdl.handler}}Binding" type="typens:{{var wsdl.handler}}PortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="salesOrderList">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderInfo">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderAddComment">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderHold">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderUnhold">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderCancel">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderShipmentList">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderShipmentInfo">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderShipmentCreate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderShipmentAddComment">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderShipmentAddTrack">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderShipmentRemoveTrack">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderShipmentGetCarriers">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderInvoiceList">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderInvoiceInfo">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderInvoiceCreate">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderInvoiceAddComment">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderInvoiceCapture">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderInvoiceVoid">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="salesOrderInvoiceCancel">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="{{var wsdl.name}}Service">
+        <wsdl:port name="{{var wsdl.handler}}Port" binding="typens:{{var wsdl.handler}}Binding">
+            <soap:address location="{{var wsdl.url}}" />
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
diff --git a/app/code/core/Mage/SalesRule/Model/Rule.php b/app/code/core/Mage/SalesRule/Model/Rule.php
index 0a9544a844..2ba01176c5 100644
--- a/app/code/core/Mage/SalesRule/Model/Rule.php
+++ b/app/code/core/Mage/SalesRule/Model/Rule.php
@@ -89,6 +89,13 @@ class Mage_SalesRule_Model_Rule extends Mage_Rule_Model_Rule
      */
     protected $_couponTypes;
 
+    /**
+     * Array of already validated addresses and validation results
+     *
+     * @var array
+     */
+    protected $_validatedAddresses = array();
+
     protected function _construct()
     {
         parent::_construct();
@@ -314,7 +321,10 @@ public function getCouponTypes()
                 Mage_SalesRule_Model_Rule::COUPON_TYPE_NO_COUPON => Mage::helper('salesrule')->__('No Coupon'),
                 Mage_SalesRule_Model_Rule::COUPON_TYPE_SPECIFIC  => Mage::helper('salesrule')->__('Specific Coupon'),
             );
-            $transport = new Varien_Object(array('coupon_types' => $this->_couponTypes, 'is_coupon_type_auto_visible' => false));
+            $transport = new Varien_Object(array(
+                    'coupon_types' => $this->_couponTypes,
+                    'is_coupon_type_auto_visible' => false
+            ));
             Mage::dispatchEvent('salesrule_rule_get_coupon_types', array('transport' => $transport));
             $this->_couponTypes = $transport->getCouponTypes();
             if ($transport->getIsCouponTypeAutoVisible()) {
@@ -359,7 +369,11 @@ public function acquireCoupon($saveNewlyCreated = true, $saveAttemptCount = 10)
                     if ($e instanceof Mage_Core_Exception || $coupon->getId()) {
                         throw $e;
                     }
-                    $coupon->setCode($couponCode . self::getCouponCodeGenerator()->getDelimiter() . sprintf('%04u', rand(0, 9999)));
+                    $coupon->setCode(
+                        $couponCode .
+                        self::getCouponCodeGenerator()->getDelimiter() .
+                        sprintf('%04u', rand(0, 9999))
+                    );
                     continue;
                 }
                 $ok = true;
@@ -390,4 +404,55 @@ protected function _getUsedAttributes($serializedString)
         }
         return $result;
     }
+
+    /**
+     * Check cached validation result for specific address
+     *
+     * @param   Mage_Sales_Model_Quote_Address $address
+     * @return  bool
+     */
+    public function hasIsValidForAddress($address)
+    {
+        $addressId = $this->_getAddressId($address);
+        return isset($this->_validatedAddresses[$addressId]) ? true : false;
+    }
+
+    /**
+     * Set validation result for specific address to results cache
+     *
+     * @param   Mage_Sales_Model_Quote_Address $address
+     * @param   bool $validationResult
+     * @return  Mage_SalesRule_Model_Rule
+     */
+    public function setIsValidForAddress($address, $validationResult)
+    {
+        $addressId = $this->_getAddressId($address);
+        $this->_validatedAddresses[$addressId] = $validationResult;
+        return $this;
+    }
+
+    /**
+     * Get cached validation result for specific address
+     *
+     * @param   Mage_Sales_Model_Quote_Address $address
+     * @return  bool
+     */
+    public function getIsValidForAddress($address)
+    {
+        $addressId = $this->_getAddressId($address);
+        return isset($this->_validatedAddresses[$addressId]) ? $this->_validatedAddresses[$addressId] : false;
+    }
+
+    /**
+     * Return id for address
+     *
+     * @param   Mage_Sales_Model_Quote_Address $address
+     * @return  string
+     */
+    private function _getAddressId($address) {
+        if($address instanceof Mage_Sales_Model_Quote_Address) {
+            return $address->getId();
+        }
+        return $address;
+    }
 }
diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php
index 3776602546..a3a622a747 100644
--- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php
+++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php
@@ -34,11 +34,16 @@ public function __construct()
         $this->setType('salesrule/rule_condition_product_found');
     }
 
+    /**
+     * Load value options
+     *
+     * @return Mage_SalesRule_Model_Rule_Condition_Product_Found
+     */
     public function loadValueOptions()
     {
         $this->setValueOption(array(
-            1=>'FOUND',
-            0=>'NOT FOUND',
+            1 => Mage::helper('salesrule')->__('FOUND'),
+            0 => Mage::helper('salesrule')->__('NOT FOUND')
         ));
         return $this;
     }
diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php
index a920db0881..e8092540a3 100644
--- a/app/code/core/Mage/SalesRule/Model/Validator.php
+++ b/app/code/core/Mage/SalesRule/Model/Validator.php
@@ -139,10 +139,14 @@ protected function _getAddress(Mage_Sales_Model_Quote_Item_Abstract $item)
      */
     protected function _canProcessRule($rule, $address)
     {
-        if (!$rule->hasIsValid()) {
-            /**
-             * check per coupon usage limit
-             */
+        if ($rule->hasIsValidForAddress($address) && !$address->isObjectNew()) {
+            return $rule->getIsValidForAddress($address);
+        }
+
+        /**
+         * check per coupon usage limit
+         */
+        if ($rule->getCouponType() != Mage_SalesRule_Model_Rule::COUPON_TYPE_NO_COUPON) {
             $couponCode = $address->getQuote()->getCouponCode();
             if ($couponCode) {
                 $coupon = Mage::getModel('salesrule/coupon');
@@ -150,7 +154,7 @@ protected function _canProcessRule($rule, $address)
                 if ($coupon->getId()) {
                     // check entire usage limit
                     if ($coupon->getUsageLimit() && $coupon->getTimesUsed() >= $coupon->getUsageLimit()) {
-                        $rule->setIsValid(false);
+                        $rule->setIsValidForAddress($address, false);
                         return false;
                     }
                     // check per customer usage limit
@@ -159,43 +163,45 @@ protected function _canProcessRule($rule, $address)
                         $couponUsage = new Varien_Object();
                         Mage::getResourceModel('salesrule/coupon_usage')->loadByCustomerCoupon(
                             $couponUsage, $customerId, $coupon->getId());
-                        if ($couponUsage->getCouponId() && $couponUsage->getTimesUsed() >= $coupon->getUsagePerCustomer()) {
-                            $rule->setIsValid(false);
+                        if ($couponUsage->getCouponId() &&
+                            $couponUsage->getTimesUsed() >= $coupon->getUsagePerCustomer()
+                        ) {
+                            $rule->setIsValidForAddress($address, false);
                             return false;
                         }
                     }
                 }
             }
-            /**
-             * check per rule usage limit
-             */
-            $ruleId = $rule->getId();
-            if ($ruleId && $rule->getUsesPerCustomer()) {
-                $customerId     = $address->getQuote()->getCustomerId();
-                $ruleCustomer   = Mage::getModel('salesrule/rule_customer');
-                $ruleCustomer->loadByCustomerRule($customerId, $ruleId);
-                if ($ruleCustomer->getId()) {
-                    if ($ruleCustomer->getTimesUsed() >= $rule->getUsesPerCustomer()) {
-                        $rule->setIsValid(false);
-                        return false;
-                    }
+        }
+
+        /**
+         * check per rule usage limit
+         */
+        $ruleId = $rule->getId();
+        if ($ruleId && $rule->getUsesPerCustomer()) {
+            $customerId     = $address->getQuote()->getCustomerId();
+            $ruleCustomer   = Mage::getModel('salesrule/rule_customer');
+            $ruleCustomer->loadByCustomerRule($customerId, $ruleId);
+            if ($ruleCustomer->getId()) {
+                if ($ruleCustomer->getTimesUsed() >= $rule->getUsesPerCustomer()) {
+                    $rule->setIsValidForAddress($address, false);
+                    return false;
                 }
             }
-            $rule->afterLoad();
-            /**
-             * quote does not meet rule's conditions
-             */
-            if (!$rule->validate($address)) {
-                $rule->setIsValid(false);
-                return false;
-            }
-            /**
-             * passed all validations, remember to be valid
-             */
-            $rule->setIsValid(true);
         }
-        return $rule->getIsValid();
-
+        $rule->afterLoad();
+        /**
+         * quote does not meet rule's conditions
+         */
+        if (!$rule->validate($address)) {
+            $rule->setIsValidForAddress($address, false);
+            return false;
+        }
+        /**
+         * passed all validations, remember to be valid
+         */
+        $rule->setIsValidForAddress($address, true);
+        return true;
     }
 
     /**
@@ -268,8 +274,10 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
         $quote      = $item->getQuote();
         $address    = $this->_getAddress($item);
 
-        $itemPrice  = $this->_getItemPrice($item);
-        $baseItemPrice = $this->_getItemBasePrice($item);
+        $itemPrice              = $this->_getItemPrice($item);
+        $baseItemPrice          = $this->_getItemBasePrice($item);
+        $itemOriginalPrice      = $item->getOriginalPrice();
+        $baseItemOriginalPrice  = $item->getBaseOriginalPrice();
 
         if ($itemPrice <= 0) {
             return $this;
@@ -291,17 +299,25 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
 
             $discountAmount = 0;
             $baseDiscountAmount = 0;
+            //discount for original price
+            $originalDiscountAmount = 0;
+            $baseOriginalDiscountAmount = 0;
+
             switch ($rule->getSimpleAction()) {
                 case Mage_SalesRule_Model_Rule::TO_PERCENT_ACTION:
                     $rulePercent = max(0, 100-$rule->getDiscountAmount());
-                    //no break;
+                //no break;
                 case Mage_SalesRule_Model_Rule::BY_PERCENT_ACTION:
                     $step = $rule->getDiscountStep();
                     if ($step) {
                         $qty = floor($qty/$step)*$step;
                     }
-                    $discountAmount    = ($qty*$itemPrice - $item->getDiscountAmount()) * $rulePercent/100;
-                    $baseDiscountAmount= ($qty*$baseItemPrice - $item->getBaseDiscountAmount()) * $rulePercent/100;
+                    $_rulePct = $rulePercent/100;
+                    $discountAmount    = ($qty*$itemPrice - $item->getDiscountAmount()) * $_rulePct;
+                    $baseDiscountAmount= ($qty*$baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct;
+                    //get discount for original price
+                    $originalDiscountAmount    = ($qty*$itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct;
+                    $baseOriginalDiscountAmount= ($qty*$baseItemOriginalPrice - $item->getDiscountAmount()) * $_rulePct;
 
                     if (!$rule->getDiscountQty() || $rule->getDiscountQty()>$qty) {
                         $discountPercent = min(100, $item->getDiscountPercent()+$rulePercent);
@@ -312,6 +328,9 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
                     $quoteAmount = $quote->getStore()->convertPrice($rule->getDiscountAmount());
                     $discountAmount    = $qty*($itemPrice-$quoteAmount);
                     $baseDiscountAmount= $qty*($baseItemPrice-$rule->getDiscountAmount());
+                    //get discount for original price
+                    $originalDiscountAmount    = $qty*($itemOriginalPrice-$quoteAmount);
+                    $baseOriginalDiscountAmount= $qty*($baseItemOriginalPrice-$rule->getDiscountAmount());
                     break;
 
                 case Mage_SalesRule_Model_Rule::BY_FIXED_ACTION:
@@ -350,7 +369,8 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
                             $quoteAmount = $quote->getStore()->convertPrice($cartRules[$rule->getId()]);
                             $baseDiscountAmount = min($baseItemPrice * $qty, $cartRules[$rule->getId()]);
                         } else {
-                            $discountRate = $baseItemPrice * $qty / $this->_rulesItemTotals[$rule->getId()]['base_items_price'];
+                            $discountRate = $baseItemPrice * $qty /
+                                            $this->_rulesItemTotals[$rule->getId()]['base_items_price'];
                             $maximumItemDiscount = $rule->getDiscountAmount() * $discountRate;
                             $quoteAmount = $quote->getStore()->convertPrice($maximumItemDiscount);
 
@@ -361,6 +381,12 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
                         $discountAmount = min($itemPrice * $qty, $quoteAmount);
                         $discountAmount = $quote->getStore()->roundPrice($discountAmount);
                         $baseDiscountAmount = $quote->getStore()->roundPrice($baseDiscountAmount);
+
+                        //get discount for original price
+                        $originalDiscountAmount = min($itemOriginalPrice * $qty, $quoteAmount);
+                        $baseOriginalDiscountAmount = $quote->getStore()->roundPrice($originalDiscountAmount);
+                        $baseOriginalDiscountAmount = $quote->getStore()->roundPrice($baseItemOriginalPrice);
+
                         $cartRules[$rule->getId()] -= $baseDiscountAmount;
                     }
                     $address->setCartFixedRules($cartRules);
@@ -380,11 +406,14 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
 
                     $discountQty = $fullRuleQtyPeriod * $y;
                     if ($freeQty > $x) {
-                         $discountQty += $freeQty - $x;
+                        $discountQty += $freeQty - $x;
                     }
 
                     $discountAmount    = $discountQty * $itemPrice;
                     $baseDiscountAmount= $discountQty * $baseItemPrice;
+                    //get discount for original price
+                    $originalDiscountAmount    = $discountQty * $itemOriginalPrice;
+                    $baseOriginalDiscountAmount= $discountQty * $baseItemOriginalPrice;
                     break;
             }
 
@@ -410,12 +439,16 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
              */
             if ($percentKey) {
                 $delta      = isset($this->_roundingDeltas[$percentKey]) ? $this->_roundingDeltas[$percentKey] : 0;
-                $baseDelta  = isset($this->_baseRoundingDeltas[$percentKey]) ? $this->_baseRoundingDeltas[$percentKey] : 0;
+                $baseDelta  = isset($this->_baseRoundingDeltas[$percentKey])
+                        ? $this->_baseRoundingDeltas[$percentKey]
+                        : 0;
                 $discountAmount+= $delta;
                 $baseDiscountAmount+=$baseDelta;
 
-                $this->_roundingDeltas[$percentKey]     = $discountAmount - $quote->getStore()->roundPrice($discountAmount);
-                $this->_baseRoundingDeltas[$percentKey] = $baseDiscountAmount - $quote->getStore()->roundPrice($baseDiscountAmount);
+                $this->_roundingDeltas[$percentKey]     = $discountAmount -
+                                                          $quote->getStore()->roundPrice($discountAmount);
+                $this->_baseRoundingDeltas[$percentKey] = $baseDiscountAmount -
+                                                          $quote->getStore()->roundPrice($baseDiscountAmount);
                 $discountAmount = $quote->getStore()->roundPrice($discountAmount);
                 $baseDiscountAmount = $quote->getStore()->roundPrice($baseDiscountAmount);
             } else {
@@ -427,12 +460,19 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
              * We can't use row total here because row total not include tax
              * Discount can be applied on price included tax
              */
-            $discountAmount     = min($item->getDiscountAmount()+$discountAmount, $itemPrice*$qty);
-            $baseDiscountAmount = min($item->getBaseDiscountAmount()+$baseDiscountAmount, $baseItemPrice*$qty);
+
+            $itemDiscountAmount = $item->getDiscountAmount();
+            $itemBaseDiscountAmount = $item->getBaseDiscountAmount();
+
+            $discountAmount     = min($itemDiscountAmount + $discountAmount, $itemPrice * $qty);
+            $baseDiscountAmount = min($itemBaseDiscountAmount + $baseDiscountAmount, $baseItemPrice * $qty);
 
             $item->setDiscountAmount($discountAmount);
             $item->setBaseDiscountAmount($baseDiscountAmount);
 
+            $item->setOriginalDiscountAmount($originalDiscountAmount);
+            $item->setBaseOriginalDiscountAmount($baseOriginalDiscountAmount);
+
             $appliedRuleIds[$rule->getRuleId()] = $rule->getRuleId();
 
             $this->_maintainAddressCouponCode($address, $rule);
@@ -481,7 +521,8 @@ public function processShippingAmount(Mage_Sales_Model_Quote_Address $address)
                     $rulePercent = max(0, 100-$rule->getDiscountAmount());
                 case Mage_SalesRule_Model_Rule::BY_PERCENT_ACTION:
                     $discountAmount    = ($shippingAmount - $address->getShippingDiscountAmount()) * $rulePercent/100;
-                    $baseDiscountAmount= ($baseShippingAmount - $address->getBaseShippingDiscountAmount()) * $rulePercent/100;
+                    $baseDiscountAmount= ($baseShippingAmount -
+                                          $address->getBaseShippingDiscountAmount()) * $rulePercent/100;
                     $discountPercent = min(100, $address->getShippingDiscountPercent()+$rulePercent);
                     $address->setShippingDiscountPercent($discountPercent);
                     break;
@@ -518,7 +559,10 @@ public function processShippingAmount(Mage_Sales_Model_Quote_Address $address)
             }
 
             $discountAmount     = min($address->getShippingDiscountAmount()+$discountAmount, $shippingAmount);
-            $baseDiscountAmount = min($address->getBaseShippingDiscountAmount()+$baseDiscountAmount, $baseShippingAmount);
+            $baseDiscountAmount = min(
+                $address->getBaseShippingDiscountAmount()+$baseDiscountAmount,
+                $baseShippingAmount
+            );
             $address->setShippingDiscountAmount($discountAmount);
             $address->setBaseShippingDiscountAmount($baseDiscountAmount);
             $appliedRuleIds[$rule->getRuleId()] = $rule->getRuleId();
@@ -680,6 +724,19 @@ protected function _addDiscountDescription($address, $rule)
      * @return float
      */
     protected function _getItemPrice($item)
+    {
+        $price = $item->getDiscountCalculationPrice();
+        $calcPrice = $item->getCalculationPrice();
+        return ($price !== null) ? $price : $calcPrice;
+    }
+
+    /**
+     * Return item original price
+     *
+     * @param Mage_Sales_Model_Quote_Item_Abstract $item
+     * @return float
+     */
+    protected function _getItemOriginalPrice($item)
     {
         $price = $item->getDiscountCalculationPrice();
         return ($price !== null) ? $price : $item->getCalculationPrice();
diff --git a/app/code/core/Mage/Shipping/Model/Config.php b/app/code/core/Mage/Shipping/Model/Config.php
index 8e38980e25..4af1f0aebb 100644
--- a/app/code/core/Mage/Shipping/Model/Config.php
+++ b/app/code/core/Mage/Shipping/Model/Config.php
@@ -27,6 +27,14 @@
 
 class Mage_Shipping_Model_Config extends Varien_Object
 {
+    /**
+     * Shipping origin settings
+     */
+    const XML_PATH_ORIGIN_COUNTRY_ID = 'shipping/origin/country_id';
+    const XML_PATH_ORIGIN_REGION_ID  = 'shipping/origin/region_id';
+    const XML_PATH_ORIGIN_CITY       = 'shipping/origin/city';
+    const XML_PATH_ORIGIN_POSTCODE   = 'shipping/origin/postcode';
+
     protected static $_carriers;
 
     /**
@@ -35,7 +43,7 @@ class Mage_Shipping_Model_Config extends Varien_Object
      * @param   mixed $store
      * @return  array
      */
-    public function getActiveCarriers($store=null)
+    public function getActiveCarriers($store = null)
     {
         $carriers = array();
         $config = Mage::getStoreConfig('carriers', $store);
@@ -56,7 +64,7 @@ public function getActiveCarriers($store=null)
      * @param   mixed $store
      * @return  array
      */
-    public function getAllCarriers($store=null)
+    public function getAllCarriers($store = null)
     {
         $carriers = array();
         $config = Mage::getStoreConfig('carriers', $store);
@@ -76,7 +84,7 @@ public function getAllCarriers($store=null)
      * @param   mixed $store
      * @return  Mage_Usa_Model_Shipping_Carrier_Abstract
      */
-    public function getCarrierInstance($carrierCode, $store=null)
+    public function getCarrierInstance($carrierCode, $store = null)
     {
         $carrierConfig =  Mage::getStoreConfig('carriers/'.$carrierCode, $store);
         if (!empty($carrierConfig)) {
@@ -93,7 +101,7 @@ public function getCarrierInstance($carrierCode, $store=null)
      * @param mixed $store
      * @return Mage_Shipping_Model_Carrier_Abstract
      */
-    protected function _getCarrier($code, $config, $store=null)
+    protected function _getCarrier($code, $config, $store = null)
     {
 /*
         if (isset(self::$_carriers[$code])) {
diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result/Method.php b/app/code/core/Mage/Shipping/Model/Rate/Result/Method.php
index 4f2f6ab71c..8c4c0638f9 100644
--- a/app/code/core/Mage/Shipping/Model/Rate/Result/Method.php
+++ b/app/code/core/Mage/Shipping/Model/Rate/Result/Method.php
@@ -36,5 +36,15 @@
  */
 class Mage_Shipping_Model_Rate_Result_Method extends Mage_Shipping_Model_Rate_Result_Abstract
 {
-
+    /**
+     * Round shipping carrier's method price
+     *
+     * @param string|float|int $price
+     * @return Mage_Shipping_Model_Rate_Result_Method
+     */
+    public function setPrice($price)
+    {
+        $this->setData('price', Mage::app()->getStore()->roundPrice($price));
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/Shipping/Model/Shipping.php b/app/code/core/Mage/Shipping/Model/Shipping.php
index 9fc1a5da60..452cef9f36 100644
--- a/app/code/core/Mage/Shipping/Model/Shipping.php
+++ b/app/code/core/Mage/Shipping/Model/Shipping.php
@@ -91,19 +91,20 @@ public function getConfig()
      */
     public function collectRates(Mage_Shipping_Model_Rate_Request $request)
     {
+        $storeId = $request->getStoreId();
         if (!$request->getOrig()) {
             $request
-                ->setCountryId(Mage::getStoreConfig('shipping/origin/country_id', $request->getStore()))
-                ->setRegionId(Mage::getStoreConfig('shipping/origin/region_id', $request->getStore()))
-                ->setCity(Mage::getStoreConfig('shipping/origin/city', $request->getStore()))
-                ->setPostcode(Mage::getStoreConfig('shipping/origin/postcode', $request->getStore()));
+                ->setCountryId(Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_COUNTRY_ID, $storeId))
+                ->setRegionId(Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_REGION_ID, $storeId))
+                ->setCity(Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_CITY, $storeId))
+                ->setPostcode(Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_POSTCODE, $storeId));
         }
 
         $limitCarrier = $request->getLimitCarrier();
         if (!$limitCarrier) {
-            $carriers = Mage::getStoreConfig('carriers', $request->getStoreId());
+            $carriers = Mage::getStoreConfig('carriers', $storeId);
 
-            foreach ($carriers as $carrierCode=>$carrierConfig) {
+            foreach ($carriers as $carrierCode => $carrierConfig) {
                 $this->collectCarrierRates($carrierCode, $request);
             }
         } else {
@@ -111,7 +112,7 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request)
                 $limitCarrier = array($limitCarrier);
             }
             foreach ($limitCarrier as $carrierCode) {
-                $carrierConfig = Mage::getStoreConfig('carriers/'.$carrierCode, $request->getStoreId());
+                $carrierConfig = Mage::getStoreConfig('carriers/' . $carrierCode, $storeId);
                 if (!$carrierConfig) {
                     continue;
                 }
diff --git a/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php
index 8a05753a4a..cf545f9b7a 100644
--- a/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php
+++ b/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php
@@ -73,6 +73,7 @@ public function getSource()
      */
     public function initTotals()
     {
+        /** @var $parent Mage_Adminhtml_Block_Sales_Order_Invoice_Totals */
         $parent = $this->getParentBlock();
         $this->_order   = $parent->getOrder();
         $this->_source  = $parent->getSource();
diff --git a/app/code/core/Mage/Tax/Model/Calculation.php b/app/code/core/Mage/Tax/Model/Calculation.php
index c8c6234483..4dcf7f0573 100644
--- a/app/code/core/Mage/Tax/Model/Calculation.php
+++ b/app/code/core/Mage/Tax/Model/Calculation.php
@@ -70,7 +70,7 @@ public function setCustomer(Mage_Customer_Model_Customer $customer)
     public function getDefaultCustomerTaxClass($store=null)
     {
         if ($this->_defaultCustomerTaxClass === null) {
-            $defaultCustomerGroup = Mage::getStoreConfig('customer/create_account/default_group', $store);
+            $defaultCustomerGroup = Mage::getStoreConfig(Mage_Customer_Model_Group::XML_PATH_DEFAULT_ID, $store);
             $this->_defaultCustomerTaxClass = Mage::getModel('customer/group')->getTaxClassId($defaultCustomerGroup);
         }
         return $this->_defaultCustomerTaxClass;
@@ -235,12 +235,12 @@ public function getStoreRate($request, $store=null)
      * @param   null|store $store
      * @return  Varien_Object
      */
-    public function getRateOriginRequest($store=null)
+    public function getRateOriginRequest($store = null)
     {
         $request = new Varien_Object();
-        $request->setCountryId(Mage::getStoreConfig('shipping/origin/country_id', $store))
-            ->setRegionId(Mage::getStoreConfig('shipping/origin/region_id', $store))
-            ->setPostcode(Mage::getStoreConfig('shipping/origin/postcode', $store))
+        $request->setCountryId(Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_COUNTRY_ID, $store))
+            ->setRegionId(Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_REGION_ID, $store))
+            ->setPostcode(Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_POSTCODE, $store))
             ->setCustomerClassId($this->getDefaultCustomerTaxClass($store))
             ->setStore($store);
         return $request;
diff --git a/app/code/core/Mage/Tax/Model/Config.php b/app/code/core/Mage/Tax/Model/Config.php
index 1dfeac66f5..57278d7e69 100644
--- a/app/code/core/Mage/Tax/Model/Config.php
+++ b/app/code/core/Mage/Tax/Model/Config.php
@@ -40,7 +40,7 @@ class Mage_Tax_Model_Config
     const CONFIG_XML_PATH_PRICE_INCLUDES_TAX = 'tax/calculation/price_includes_tax';
     const CONFIG_XML_PATH_SHIPPING_INCLUDES_TAX = 'tax/calculation/shipping_includes_tax';
     const CONFIG_XML_PATH_BASED_ON = 'tax/calculation/based_on';
-    CONST CONFIG_XML_PATH_APPLY_ON = 'tax/calculation/apply_tax_on';
+    const CONFIG_XML_PATH_APPLY_ON = 'tax/calculation/apply_tax_on';
     const CONFIG_XML_PATH_APPLY_AFTER_DISCOUNT = 'tax/calculation/apply_after_discount';
     const CONFIG_XML_PATH_DISCOUNT_TAX = 'tax/calculation/discount_tax';
     const XML_PATH_ALGORITHM = 'tax/calculation/algorithm';
@@ -274,7 +274,10 @@ public function getShippingPriceDisplayType($store = null)
     public function shippingPriceIncludesTax($store = null)
     {
         if ($this->_shippingPriceIncludeTax === null) {
-            $this->_shippingPriceIncludeTax = (bool) Mage::getStoreConfig(self::CONFIG_XML_PATH_SHIPPING_INCLUDES_TAX, $store);
+            $this->_shippingPriceIncludeTax = (bool)Mage::getStoreConfig(
+                self::CONFIG_XML_PATH_SHIPPING_INCLUDES_TAX,
+                $store
+            );
         }
         return $this->_shippingPriceIncludeTax;
     }
diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php
index 9c671045ae..df83aac2fb 100644
--- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php
+++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php
@@ -142,7 +142,9 @@ public function getCalculationProcess($request, $rates = null)
 
             $currentRate += $value;
 
-            if (!isset($rates[$i+1]) || $rates[$i+1]['priority'] != $priority || (isset($rates[$i+1]['process']) && $rates[$i+1]['process'] != $rate['process'])) {
+            if (!isset($rates[$i+1]) || $rates[$i+1]['priority'] != $priority
+                || (isset($rates[$i+1]['process']) && $rates[$i+1]['process'] != $rate['process'])
+            ) {
                 $row['percent'] = (100+$totalPercent)*($currentRate/100);
                 $row['id'] = implode($ids);
                 $result[] = $row;
@@ -231,12 +233,16 @@ protected function _getRates($request)
             $select->join(
                 array('rate'=>$this->getTable('tax/tax_calculation_rate')),
                 'rate.tax_calculation_rate_id = main_table.tax_calculation_rate_id',
-                array('value'=>'rate.rate', 'rate.tax_country_id', 'rate.tax_region_id', 'rate.tax_postcode', 'rate.tax_calculation_rate_id', 'rate.code')
+                array(
+                    'value'=>'rate.rate', 'rate.tax_country_id', 'rate.tax_region_id', 'rate.tax_postcode',
+                    'rate.tax_calculation_rate_id', 'rate.code'
+                )
             );
 
             $select->joinLeft(
                 array('title_table'=>$this->getTable('tax/tax_calculation_rate_title')),
-                "rate.tax_calculation_rate_id = title_table.tax_calculation_rate_id AND title_table.store_id = '{$storeId}'",
+                "rate.tax_calculation_rate_id = title_table.tax_calculation_rate_id "
+                . "AND title_table.store_id = '{$storeId}'",
                 array('title'=>'IFNULL(title_table.value, rate.code)')
             );
 
@@ -262,7 +268,9 @@ protected function _getRates($request)
              * @see ZF-7592 issue http://framework.zend.com/issues/browse/ZF-7592
              */
             $select = $this->_getReadAdapter()->select()->union(array('(' . $select . ')', '(' . $selectClone . ')'));
-            $order = array('priority ASC', 'tax_calculation_rule_id ASC', 'tax_country_id DESC', 'tax_region_id DESC', 'tax_postcode DESC', 'value DESC');
+            $order = array('priority ASC', 'tax_calculation_rule_id ASC', 'tax_country_id DESC', 'tax_region_id DESC',
+                'tax_postcode DESC', 'value DESC'
+            );
             $select->order($order);
 
             $this->_ratesCache[$cacheKey] = $this->_getReadAdapter()->fetchAll($select);
@@ -315,24 +323,27 @@ public function getRateIds($request)
 
     public function getRatesByCustomerTaxClass($customerTaxClass, $productTaxClass = null)
     {
+        $customerTaxClass = (int) $customerTaxClass;
+
         $calcJoinConditions  = "calc_table.tax_calculation_rate_id = main_table.tax_calculation_rate_id";
         $calcJoinConditions .= " AND calc_table.customer_tax_class_id = '{$customerTaxClass}'";
         if ($productTaxClass) {
+            $productTaxClass = (int) $productTaxClass;
             $calcJoinConditions .= " AND calc_table.product_tax_class_id = '{$productTaxClass}'";
         }
 
         $selectCSP = $this->_getReadAdapter()->select();
-        $selectCSP->from(array('main_table'=>$this->getTable('tax/tax_calculation_rate')), array('country'=>'tax_country_id', 'region_id'=>'tax_region_id', 'postcode'=>'tax_postcode'))
+        $selectCSP->from(array('main_table'=>$this->getTable('tax/tax_calculation_rate')),
+            array('country'=>'tax_country_id', 'region_id'=>'tax_region_id', 'postcode'=>'tax_postcode')
+        )
             ->joinInner(
                     array('calc_table'=>$this->getTable('tax/tax_calculation')),
                     $calcJoinConditions,
                     array('product_class'=>'calc_table.product_tax_class_id'))
-
             ->joinLeft(
                     array('state_table'=>$this->getTable('directory/country_region')),
                     'state_table.region_id = main_table.tax_region_id',
                     array('region_code'=>'state_table.code'))
-
             ->distinct(true);
 
         $CSP = $this->_getReadAdapter()->fetchAll($selectCSP);
diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php
index f6aa7a5620..18b3362f51 100644
--- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php
+++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php
@@ -419,6 +419,7 @@ protected function _totalBaseCalculation($item, $request)
         $basePrice      = $baseTaxPrice     = $item->getBaseCalculationPrice();
         $subtotal       = $taxSubtotal      = $item->getRowTotal();
         $baseSubtotal   = $baseTaxSubtotal  = $item->getBaseRowTotal();
+
         $taxOnOrigPrice = !$this->_helper->applyTaxOnCustomPrice($this->_store) && $item->hasCustomPrice();
         if ($taxOnOrigPrice) {
             $origSubtotal       = $item->getOriginalPrice() * $qty;
@@ -427,62 +428,99 @@ protected function _totalBaseCalculation($item, $request)
         $item->setTaxPercent($rate);
         if ($this->_config->priceIncludesTax($this->_store)) {
             if ($this->_sameRateAsStore($request)) {
-                $rowTax         = $this->_deltaRound($calc->calcTaxAmount($subtotal, $rate, true, false), $rate, true);
-                $baseRowTax     = $this->_deltaRound($calc->calcTaxAmount($baseSubtotal, $rate, true, false), $rate, true, 'base');
+                if ($taxOnOrigPrice) {
+                    $rowTax =
+                        $this->_deltaRound($calc->calcTaxAmount($origSubtotal, $rate, true, false), $rate, true);
+                    $baseRowTax =
+                        $this->_deltaRound(
+                            $calc->calcTaxAmount($baseOrigSubtotal, $rate, true, false), $rate, true, 'base'
+                        );
+
+                    $taxable        = $origSubtotal;
+                    $baseTaxable    = $baseOrigSubtotal;
+                } else {
+                    $rowTax =
+                        $this->_deltaRound($calc->calcTaxAmount($subtotal, $rate, true, false), $rate, true);
+                    $baseRowTax =
+                        $this->_deltaRound(
+                            $calc->calcTaxAmount($baseSubtotal, $rate, true, false), $rate, true, 'base'
+                        );
+
+                    $taxable        = $subtotal;
+                    $baseTaxable    = $baseSubtotal;
+                }
                 $taxPrice       = $price;
                 $baseTaxPrice   = $basePrice;
+
                 $taxSubtotal    = $subtotal;
                 $baseTaxSubtotal= $baseSubtotal;
+
                 $subtotal       = $subtotal - $rowTax;
                 $baseSubtotal   = $baseSubtotal - $baseRowTax;
+
                 $price          = $calc->round($subtotal/$qty);
                 $basePrice      = $calc->round($baseSubtotal/$qty);
-                if ($taxOnOrigPrice) {
-                    $taxable        = $origSubtotal;
-                    $baseTaxable    = $baseOrigSubtotal;
-                } else {
-                    $taxable        = $taxSubtotal;
-                    $baseTaxable    = $baseTaxSubtotal;
-                }
+
                 $isPriceInclTax = true;
             } else {
                 $storeRate      = $calc->getStoreRate($request, $this->_store);
-                $storeTax       = $calc->calcTaxAmount($subtotal, $storeRate, true, false);
-                $baseStoreTax   = $calc->calcTaxAmount($baseSubtotal, $storeRate, true, false);
+                if ($taxOnOrigPrice) {
+                    $storeTax           = $calc->calcTaxAmount($origSubtotal, $storeRate, true, false);
+                    $baseStoreTax       = $calc->calcTaxAmount($baseOrigSubtotal, $storeRate, true, false);
+                } else {
+                    $storeTax           = $calc->calcTaxAmount($subtotal, $storeRate, true, false);
+                    $baseStoreTax       = $calc->calcTaxAmount($baseSubtotal, $storeRate, true, false);
+                }
                 $subtotal       = $calc->round($subtotal - $storeTax);
                 $baseSubtotal   = $calc->round($baseSubtotal - $baseStoreTax);
+
                 $price          = $calc->round($subtotal/$qty);
                 $basePrice      = $calc->round($baseSubtotal/$qty);
 
-                $rowTax         = $this->_deltaRound($calc->calcTaxAmount($subtotal, $rate, false, false), $rate, true);
-                $baseRowTax     = $this->_deltaRound($calc->calcTaxAmount($baseSubtotal, $rate, false, false), $rate, true, 'base');
+                $rowTax =
+                    $this->_deltaRound($calc->calcTaxAmount($subtotal, $rate, false, false), $rate, true);
+                $baseRowTax =
+                    $this->_deltaRound(
+                        $calc->calcTaxAmount($baseSubtotal, $rate, false, false), $rate, true, 'base'
+                    );
+
                 $taxSubtotal    = $subtotal + $rowTax;
                 $baseTaxSubtotal= $baseSubtotal + $baseRowTax;
+
                 $taxPrice       = $calc->round($taxSubtotal/$qty);
                 $baseTaxPrice   = $calc->round($baseTaxSubtotal/$qty);
-                if ($taxOnOrigPrice) {
-                    $taxable        = $calc->round($origSubtotal - $storeTax);
-                    $baseTaxable    = $calc->round($baseOrigSubtotal - $baseStoreTax);
-                } else {
-                    $taxable        = $subtotal;
-                    $baseTaxable    = $baseSubtotal;
-                }
+
+                $taxable        = $subtotal;
+                $baseTaxable    = $baseSubtotal;
+
                 $isPriceInclTax = false;
             }
         } else {
-            $rowTax         = $this->_deltaRound($calc->calcTaxAmount($subtotal, $rate, false, false), $rate, true);
-            $baseRowTax     = $this->_deltaRound($calc->calcTaxAmount($baseSubtotal, $rate, false, false), $rate, true, 'base');
-            $taxSubtotal    = $subtotal + $rowTax;
-            $baseTaxSubtotal= $baseSubtotal + $baseRowTax;
-            $taxPrice       = $calc->round($taxSubtotal/$qty);
-            $baseTaxPrice   = $calc->round($baseTaxSubtotal/$qty);
             if ($taxOnOrigPrice) {
+                $rowTax =
+                    $this->_deltaRound($calc->calcTaxAmount($origSubtotal, $rate, false, false), $rate, true);
+                $baseRowTax =
+                    $this->_deltaRound(
+                        $calc->calcTaxAmount($baseOrigSubtotal, $rate, false, false), $rate, true, 'base'
+                    );
+
                 $taxable        = $origSubtotal;
                 $baseTaxable    = $baseOrigSubtotal;
             } else {
+                $rowTax         = $this->_deltaRound($calc->calcTaxAmount($subtotal, $rate, false, false), $rate, true);
+                $baseRowTax     =
+                    $this->_deltaRound($calc->calcTaxAmount($baseSubtotal, $rate, false, false), $rate, true, 'base');
+
                 $taxable        = $subtotal;
                 $baseTaxable    = $baseSubtotal;
             }
+
+            $taxSubtotal    = $subtotal + $rowTax;
+            $baseTaxSubtotal= $baseSubtotal + $baseRowTax;
+
+            $taxPrice       = $calc->round($taxSubtotal/$qty);
+            $baseTaxPrice   = $calc->round($baseTaxSubtotal/$qty);
+
             $isPriceInclTax = false;
         }
 
diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
index 91279acf07..621855eb44 100644
--- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
+++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
@@ -243,8 +243,18 @@ protected function _calculateShippingTax(Mage_Sales_Model_Quote_Address $address
             case Mage_Tax_Model_Calculation::CALC_TAX_AFTER_DISCOUNT_ON_INCL:
                 $discountAmount     = $address->getShippingDiscountAmount();
                 $baseDiscountAmount = $address->getBaseShippingDiscountAmount();
-                $tax        = $this->_calculator->calcTaxAmount($shipping - $discountAmount, $rate, $inclTax, false);
-                $baseTax    = $this->_calculator->calcTaxAmount($baseShipping - $baseDiscountAmount, $rate, $inclTax, false);
+                $tax = $this->_calculator->calcTaxAmount(
+                    $shipping - $discountAmount,
+                    $rate,
+                    $inclTax,
+                    false
+                );
+                $baseTax = $this->_calculator->calcTaxAmount(
+                    $baseShipping - $baseDiscountAmount,
+                    $rate,
+                    $inclTax,
+                    false
+                );
                 break;
         }
 
@@ -299,7 +309,13 @@ protected function _unitBaseCalculation(Mage_Sales_Model_Quote_Address $address,
                     $this->_addAmount($child->getTaxAmount());
                     $this->_addBaseAmount($child->getBaseTaxAmount());
                     $applied = $this->_calculator->getAppliedRates($taxRateRequest);
-                    $this->_saveAppliedTaxes($address, $applied, $child->getTaxAmount(), $child->getBaseTaxAmount(), $rate);
+                    $this->_saveAppliedTaxes(
+                        $address,
+                        $applied,
+                        $child->getTaxAmount(),
+                        $child->getBaseTaxAmount(),
+                        $rate
+                    );
                 }
                 $this->_recalculateParent($item);
             }
@@ -310,7 +326,13 @@ protected function _unitBaseCalculation(Mage_Sales_Model_Quote_Address $address,
                 $this->_addAmount($item->getTaxAmount());
                 $this->_addBaseAmount($item->getBaseTaxAmount());
                 $applied = $this->_calculator->getAppliedRates($taxRateRequest);
-                $this->_saveAppliedTaxes($address, $applied, $item->getTaxAmount(), $item->getBaseTaxAmount(), $rate);
+                $this->_saveAppliedTaxes(
+                    $address,
+                    $applied,
+                    $item->getTaxAmount(),
+                    $item->getBaseTaxAmount(),
+                    $rate
+                );
             }
         }
         return $this;
@@ -325,12 +347,10 @@ protected function _unitBaseCalculation(Mage_Sales_Model_Quote_Address $address,
      */
     protected function _calcUnitTaxAmount(Mage_Sales_Model_Quote_Item_Abstract $item, $rate)
     {
-        $extra      = $item->getExtraTaxableAmount();
-        $baseExtra  = $item->getBaseExtraTaxableAmount();
         $qty        = $item->getTotalQty();
         $inclTax    = $item->getIsPriceInclTax();
-        $price      = $item->getTaxableAmount();
-        $basePrice  = $item->getBaseTaxableAmount();
+        $price      = $item->getTaxableAmount() + $item->getExtraTaxableAmount();
+        $basePrice  = $item->getBaseTaxableAmount() + $item->getBaseExtraTaxableAmount();
         $rateKey    = (string)$rate;
         $item->setTaxPercent($rate);
 
@@ -346,8 +366,16 @@ protected function _calcUnitTaxAmount(Mage_Sales_Model_Quote_Item_Abstract $item
             case Mage_Tax_Model_Calculation::CALC_TAX_AFTER_DISCOUNT_ON_INCL:
                 $discountAmount     = $item->getDiscountAmount() / $qty;
                 $baseDiscountAmount = $item->getBaseDiscountAmount() / $qty;
-                $unitTax            = $this->_calculator->calcTaxAmount(max($price-$discountAmount, 0), $rate, $inclTax);
-                $baseUnitTax        = $this->_calculator->calcTaxAmount(max($basePrice-$baseDiscountAmount, 0), $rate, $inclTax);
+                $unitTax = $this->_calculator->calcTaxAmount(
+                    max($price - $discountAmount, 0),
+                    $rate,
+                    $inclTax
+                );
+                $baseUnitTax = $this->_calculator->calcTaxAmount(
+                    max($basePrice - $baseDiscountAmount, 0),
+                    $rate,
+                    $inclTax
+                );
                 if ($inclTax && $discountAmount > 0) {
                     $hiddenTax      = $this->_calculator->calcTaxAmount($discountAmount, $rate, $inclTax, false);
                     $baseHiddenTax  = $this->_calculator->calcTaxAmount($baseDiscountAmount, $rate, $inclTax, false);
@@ -401,7 +429,13 @@ protected function _rowBaseCalculation(Mage_Sales_Model_Quote_Address $address,
                     $this->_addAmount($child->getTaxAmount());
                     $this->_addBaseAmount($child->getBaseTaxAmount());
                     $applied = $this->_calculator->getAppliedRates($taxRateRequest);
-                    $this->_saveAppliedTaxes($address, $applied, $child->getTaxAmount(), $child->getBaseTaxAmount(), $rate);
+                    $this->_saveAppliedTaxes(
+                        $address,
+                        $applied,
+                        $child->getTaxAmount(),
+                        $child->getBaseTaxAmount(),
+                        $rate
+                    );
                 }
                 $this->_recalculateParent($item);
             }
@@ -412,7 +446,13 @@ protected function _rowBaseCalculation(Mage_Sales_Model_Quote_Address $address,
                 $this->_addAmount($item->getTaxAmount());
                 $this->_addBaseAmount($item->getBaseTaxAmount());
                 $applied = $this->_calculator->getAppliedRates($taxRateRequest);
-                $this->_saveAppliedTaxes($address, $applied, $item->getTaxAmount(), $item->getBaseTaxAmount(), $rate);
+                $this->_saveAppliedTaxes(
+                    $address,
+                    $applied,
+                    $item->getTaxAmount(),
+                    $item->getBaseTaxAmount(),
+                    $rate
+                );
             }
         }
         return $this;
@@ -445,8 +485,16 @@ protected function _calcRowTaxAmount($item, $rate)
             case Mage_Tax_Model_Calculation::CALC_TAX_AFTER_DISCOUNT_ON_INCL:
                 $discountAmount     = $item->getDiscountAmount();
                 $baseDiscountAmount = $item->getBaseDiscountAmount();
-                $rowTax             = $this->_calculator->calcTaxAmount(max($subtotal - $discountAmount, 0), $rate, $inclTax);
-                $baseRowTax         = $this->_calculator->calcTaxAmount(max($baseSubtotal - $baseDiscountAmount, 0), $rate, $inclTax);
+                $rowTax = $this->_calculator->calcTaxAmount(
+                    max($subtotal - $discountAmount, 0),
+                    $rate,
+                    $inclTax
+                );
+                $baseRowTax = $this->_calculator->calcTaxAmount(
+                    max($baseSubtotal - $baseDiscountAmount, 0),
+                    $rate,
+                    $inclTax
+                );
                 if ($inclTax && $discountAmount > 0) {
                     $hiddenTax      = $this->_calculator->calcTaxAmount($discountAmount, $rate, $inclTax, false);
                     $baseHiddenTax  = $this->_calculator->calcTaxAmount($baseDiscountAmount, $rate, $inclTax, false);
@@ -556,8 +604,14 @@ protected function _aggregateTaxPerRate($item, $rate, &$taxGroups)
                 break;
             case Mage_Tax_Model_Calculation::CALC_TAX_AFTER_DISCOUNT_ON_EXCL:
             case Mage_Tax_Model_Calculation::CALC_TAX_AFTER_DISCOUNT_ON_INCL:
-                $discount           = $item->getDiscountAmount();
-                $baseDiscount       = $item->getBaseDiscountAmount();
+                if ($this->_helper->applyTaxOnOriginalPrice($this->_store)) {
+                    $discount           = $item->getOriginalDiscountAmount();
+                    $baseDiscount       = $item->getBaseOriginalDiscountAmount();
+                } else {
+                    $discount           = $item->getDiscountAmount();
+                    $baseDiscount       = $item->getBaseDiscountAmount();
+                }
+
                 $taxSubtotal        = max($subtotal - $discount, 0);
                 $baseTaxSubtotal    = max($baseSubtotal - $baseDiscount, 0);
                 $rowTax             = $this->_calculator->calcTaxAmount($taxSubtotal, $rate, $inclTax, false);
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
index a3807b1fb4..acdf699b0b 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
@@ -160,7 +160,7 @@ public function setRequest(Mage_Shipping_Model_Rate_Request $request)
         if ($request->getOrigCountry()) {
             $origCountry = $request->getOrigCountry();
         } else {
-            $origCountry = Mage::getStoreConfig('shipping/origin/country_id', $this->getStore());
+            $origCountry = Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_COUNTRY_ID, $this->getStore());
         }
         $r->setOrigCountry($origCountry);
 
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
index c8cec58129..9d8b2f4711 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
@@ -93,14 +93,14 @@ public function setRequest(Mage_Shipping_Model_Rate_Request $request)
         if ($request->getOrigCountry()) {
             $origCountry = $request->getOrigCountry();
         } else {
-            $origCountry = Mage::getStoreConfig('shipping/origin/country_id', $this->getStore());
+            $origCountry = Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_COUNTRY_ID, $this->getStore());
         }
         $r->setOrigCountry(Mage::getModel('directory/country')->load($origCountry)->getIso2Code());
 
         if ($request->getOrigPostcode()) {
             $r->setOrigPostal($request->getOrigPostcode());
         } else {
-            $r->setOrigPostal(Mage::getStoreConfig('shipping/origin/postcode', $this->getStore()));
+            $r->setOrigPostal(Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_POSTCODE, $this->getStore()));
         }
 
         if ($request->getDestCountryId()) {
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
index d5712ca099..4662ec2085 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
@@ -106,7 +106,7 @@ public function setRequest(Mage_Shipping_Model_Rate_Request $request)
         if ($request->getOrigCountry()) {
             $origCountry = $request->getOrigCountry();
         } else {
-            $origCountry = Mage::getStoreConfig('shipping/origin/country_id', $this->getStore());
+            $origCountry = Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_COUNTRY_ID, $this->getStore());
         }
 
         $r->setOrigCountry(Mage::getModel('directory/country')->load($origCountry)->getIso2Code());
@@ -114,7 +114,7 @@ public function setRequest(Mage_Shipping_Model_Rate_Request $request)
         if ($request->getOrigRegionCode()) {
             $origRegionCode = $request->getOrigRegionCode();
         } else {
-            $origRegionCode = Mage::getStoreConfig('shipping/origin/region_id', $this->getStore());
+            $origRegionCode = Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_REGION_ID, $this->getStore());
             if (is_numeric($origRegionCode)) {
                 $origRegionCode = Mage::getModel('directory/region')->load($origRegionCode)->getCode();
             }
@@ -124,13 +124,13 @@ public function setRequest(Mage_Shipping_Model_Rate_Request $request)
         if ($request->getOrigPostcode()) {
             $r->setOrigPostal($request->getOrigPostcode());
         } else {
-            $r->setOrigPostal(Mage::getStoreConfig('shipping/origin/postcode', $this->getStore()));
+            $r->setOrigPostal(Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_POSTCODE, $this->getStore()));
         }
 
         if ($request->getOrigCity()) {
             $r->setOrigCity($request->getOrigCity());
         } else {
-            $r->setOrigCity(Mage::getStoreConfig('shipping/origin/city', $this->getStore()));
+            $r->setOrigCity(Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_CITY, $this->getStore()));
         }
 
 
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php
index 375a0b77d9..9135e40dde 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php
@@ -138,7 +138,7 @@ public function setRequest(Mage_Shipping_Model_Rate_Request $request)
         if ($request->getOrigPostcode()) {
             $r->setOrigPostal($request->getOrigPostcode());
         } else {
-            $r->setOrigPostal(Mage::getStoreConfig('shipping/origin/postcode'));
+            $r->setOrigPostal(Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_POSTCODE, $this->getStore()));
         }
 
         if ($request->getDestCountryId()) {
diff --git a/app/code/core/Mage/Weee/Helper/Data.php b/app/code/core/Mage/Weee/Helper/Data.php
index 869024ad9e..d66ab73a62 100644
--- a/app/code/core/Mage/Weee/Helper/Data.php
+++ b/app/code/core/Mage/Weee/Helper/Data.php
@@ -124,7 +124,8 @@ public function includeInSubtotal($store = null)
     public function getAmount($product, $shipping = null, $billing = null, $website = null, $calculateTaxes = false)
     {
         if ($this->isEnabled()) {
-            return Mage::getSingleton('weee/tax')->getWeeeAmount($product, $shipping, $billing, $website, $calculateTaxes);
+            return Mage::getSingleton('weee/tax')->
+                    getWeeeAmount($product, $shipping, $billing, $website, $calculateTaxes);
         }
         return 0;
     }
@@ -168,9 +169,11 @@ public function typeOfDisplay($product, $compareTo = null, $zone = null, $store
         }
     }
 
-    public function getProductWeeeAttributes($product, $shipping = null, $billing = null, $website = null, $calculateTaxes = false)
+    public function getProductWeeeAttributes($product, $shipping = null, $billing = null,
+        $website = null, $calculateTaxes = false)
     {
-        return Mage::getSingleton('weee/tax')->getProductWeeeAttributes($product, $shipping, $billing, $website, $calculateTaxes);
+        return Mage::getSingleton('weee/tax')
+                ->getProductWeeeAttributes($product, $shipping, $billing, $website, $calculateTaxes);
     }
 
     public function getApplied($item)
@@ -213,11 +216,36 @@ public function getProductWeeeAttributesForDisplay($product)
         return array();
     }
 
+    /**
+     * Get Product Weee attributes for price renderer
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @param null|false|Varien_Object $shipping Shipping Address
+     * @param null|false|Varien_Object $billing Billing Address
+     * @param null|Mage_Core_Model_Website $website
+     * @param mixed $calculateTaxes
+     * @return array
+     */
+    public function getProductWeeeAttributesForRenderer($product, $shipping = null, $billing = null,
+        $website = null, $calculateTaxes = false)
+    {
+        if ($this->isEnabled()) {
+            return $this->getProductWeeeAttributes(
+                $product,
+                $shipping,
+                $billing,
+                $website,
+                $calculateTaxes ? $calculateTaxes : $this->typeOfDisplay($product, 1)
+            );
+        }
+        return array();
+    }
 
     public function getAmountForDisplay($product)
     {
         if ($this->isEnabled()) {
-            return Mage::getModel('weee/tax')->getWeeeAmount($product, null, null, null, $this->typeOfDisplay($product, 1));
+            return Mage::getModel('weee/tax')
+                    ->getWeeeAmount($product, null, null, null, $this->typeOfDisplay($product, 1));
         }
         return 0;
     }
@@ -233,10 +261,13 @@ public function getOriginalAmount($product)
     public function processTierPrices($product, &$tierPrices)
     {
         $weeeAmount = $this->getAmountForDisplay($product);
+        $store = Mage::app()->getStore();
         foreach ($tierPrices as &$tier) {
-            $tier['formated_price_incl_weee'] = Mage::app()->getStore()->formatPrice(Mage::app()->getStore()->convertPrice(Mage::helper('tax')->getPrice($product, $tier['website_price'], true)+$weeeAmount));
-            $tier['formated_price_incl_weee_only'] = Mage::app()->getStore()->formatPrice(Mage::app()->getStore()->convertPrice(Mage::helper('tax')->getPrice($product, $tier['website_price'])+$weeeAmount));
-            $tier['formated_weee'] = Mage::app()->getStore()->formatPrice(Mage::app()->getStore()->convertPrice($weeeAmount));
+            $tier['formated_price_incl_weee'] = $store->formatPrice($store
+                ->convertPrice(Mage::helper('tax')->getPrice($product, $tier['website_price'], true)+$weeeAmount));
+            $tier['formated_price_incl_weee_only'] = $store->formatPrice($store
+                ->convertPrice(Mage::helper('tax')->getPrice($product, $tier['website_price'])+$weeeAmount));
+            $tier['formated_weee'] = $store->formatPrice($store->convertPrice($weeeAmount));
         }
         return $this;
     }
diff --git a/app/code/core/Mage/Weee/Model/Observer.php b/app/code/core/Mage/Weee/Model/Observer.php
index c3a5421f82..7930f367a8 100644
--- a/app/code/core/Mage/Weee/Model/Observer.php
+++ b/app/code/core/Mage/Weee/Model/Observer.php
@@ -102,7 +102,9 @@ public function prepareCatalogIndexSelect(Varien_Event_Observer $observer)
                 "_discount_percent.website_id = '{$websiteId}'",
                 "_discount_percent.customer_group_id = '{$customerGroupId}'",
             );
-            $select->joinLeft(array('_discount_percent'=>Mage::getSingleton('weee/tax')->getResource()->getTable('weee/discount')), implode(' AND ', $joinConditions), array());
+            $tableWeeDiscount = Mage::getSingleton('weee/tax')->getResource()->getTable('weee/discount');
+            $select->joinLeft(
+                array('_discount_percent' => $tableWeeDiscount), implode(' AND ', $joinConditions), array());
         }
         foreach ($attributes as $attribute) {
             $tableAlias = "weee_{$attribute}_table";
@@ -116,7 +118,7 @@ public function prepareCatalogIndexSelect(Varien_Event_Observer $observer)
         $response->setAdditionalCalculations($additionalCalculations);
 
         $rateRequest = Mage::getSingleton('tax/calculation')->getRateRequest();
-        $attributes = array();
+
         $attributes = Mage::getSingleton('weee/tax')->getWeeeTaxAttributeCodes();
         foreach ($attributes as $attribute) {
             $attributeId = Mage::getSingleton('eav/entity_attribute')->getIdByCode('catalog_product', $attribute);
@@ -133,7 +135,8 @@ public function prepareCatalogIndexSelect(Varien_Event_Observer $observer)
             $on[] = "({$tableAlias}.state in ('{$region}', '*'))";
 
             $attributeSelect = $this->_getSelect();
-            $attributeSelect->from(array($tableAlias=>Mage::getSingleton('weee/tax')->getResource()->getTable('weee/tax')));
+            $attributeSelect->from(array(
+                $tableAlias => Mage::getSingleton('weee/tax')->getResource()->getTable('weee/tax')));
 
 
             foreach ($on as $one) {
@@ -141,10 +144,11 @@ public function prepareCatalogIndexSelect(Varien_Event_Observer $observer)
             }
             $attributeSelect->limit(1);
 
-            $order = array($tableAlias.'.state DESC', $tableAlias.'.website_id DESC');
+            $order = array($tableAlias . '.state DESC', $tableAlias . '.website_id DESC');
 
             $attributeSelect->order($order);
-            $select->joinLeft(array($tableAlias=>$attributeSelect), $table.'.entity_id = '.$tableAlias.'.entity_id', array());
+            $select->joinLeft(array(
+                $tableAlias => $attributeSelect), $table . '.entity_id = ' . $tableAlias . '.entity_id', array());
         }
     }
 
diff --git a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php
index d450cdd37b..6ec909bfe2 100644
--- a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php
+++ b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php
@@ -223,7 +223,7 @@ protected function _processDiscountSettings($item, $value, $baseValue)
     protected function _processTaxSettings($item, $value, $baseValue, $rowValue, $baseRowValue)
     {
         if ($this->_helper->isTaxable($this->_store) && $rowValue) {
-            if ($this->_config->priceIncludesTax($this->_store)) {
+            if (!$this->_config->priceIncludesTax($this->_store)) {
                 $item->setExtraTaxableAmount($value)
                     ->setBaseExtraTaxableAmount($baseValue)
                     ->setExtraRowTaxableAmount($rowValue)
@@ -336,7 +336,12 @@ protected function _processItem(Mage_Sales_Model_Quote_Address $address, $item,
 
         $taxCalculationModel = Mage::getSingleton('tax/calculation');
         /* @var $taxCalculationModel Mage_Tax_Model_Calculation */
-        $request = $taxCalculationModel->getRateRequest($address, $address->getQuote()->getBillingAddress(), $custTaxClassId, $store);
+        $request = $taxCalculationModel->getRateRequest(
+            $address,
+            $address->getQuote()->getBillingAddress(),
+            $custTaxClassId,
+            $store
+        );
         $defaultRateRequest = $taxCalculationModel->getRateRequest(false, false, false, $store);
 
         $attributes = $this->_helper->getProductWeeeAttributes(
@@ -382,7 +387,9 @@ protected function _processItem(Mage_Sales_Model_Quote_Address $address, $item,
              */
             if ($this->_helper->isTaxable($store)) {
                 $currentPercent = $item->getTaxPercent();
-                $defaultPercent = $taxCalculationModel->getRate($defaultRateRequest->setProductClassId($item->getProduct()->getTaxClassId()));
+                $defaultPercent = $taxCalculationModel->getRate(
+                    $defaultRateRequest->setProductClassId($item->getProduct()->getTaxClassId())
+                );
 
                 $valueBeforeVAT = $rowValue;
                 $baseValueBeforeVAT = $baseRowValue;
@@ -413,7 +420,9 @@ protected function _processItem(Mage_Sales_Model_Quote_Address $address, $item,
                 $address->setTaxAmount($address->getTaxAmount() + $disposition);
                 $address->setBaseTaxAmount($address->getBaseTaxAmount() + $baseDisposition);
 
-                $rate = $taxCalculationModel->getRate($request->setProductClassId($item->getProduct()->getTaxClassId()));
+                $rate = $taxCalculationModel->getRate(
+                    $request->setProductClassId($item->getProduct()->getTaxClassId())
+                );
 
                 $this->_saveAppliedTaxes(
                    $address,
@@ -423,8 +432,12 @@ protected function _processItem(Mage_Sales_Model_Quote_Address $address, $item,
                    $rate
                 );
 
-                $address->setGrandTotal($address->getGrandTotal() + $store->roundPrice($valueBeforeVAT-$rowValue));
-                $address->setBaseGrandTotal($address->getBaseGrandTotal() + $store->roundPrice($baseValueBeforeVAT-$baseRowValue));
+                $address->setGrandTotal(
+                    $address->getGrandTotal() + $store->roundPrice($valueBeforeVAT - $rowValue)
+                );
+                $address->setBaseGrandTotal(
+                    $address->getBaseGrandTotal() + $store->roundPrice($baseValueBeforeVAT - $baseRowValue)
+                );
             }
 
             /**
@@ -485,17 +498,33 @@ protected function _processItem(Mage_Sales_Model_Quote_Address $address, $item,
         if ($updateParent) {
             $parent = $item->getParentItem();
 
-            $parent->setBaseWeeeTaxDisposition($parent->getBaseWeeeTaxDisposition() + $item->getBaseWeeeTaxDisposition());
-            $parent->setWeeeTaxDisposition($parent->getWeeeTaxDisposition() + $item->getWeeeTaxDisposition());
+            $parent->setBaseWeeeTaxDisposition(
+                $parent->getBaseWeeeTaxDisposition() + $item->getBaseWeeeTaxDisposition()
+            );
+            $parent->setWeeeTaxDisposition(
+                $parent->getWeeeTaxDisposition() + $item->getWeeeTaxDisposition()
+            );
 
-            $parent->setBaseWeeeTaxRowDisposition($parent->getBaseWeeeTaxRowDisposition() + $item->getBaseWeeeTaxRowDisposition());
-            $parent->setWeeeTaxRowDisposition($parent->getWeeeTaxRowDisposition() + $item->getWeeeTaxRowDisposition());
+            $parent->setBaseWeeeTaxRowDisposition(
+                $parent->getBaseWeeeTaxRowDisposition() + $item->getBaseWeeeTaxRowDisposition()
+            );
+            $parent->setWeeeTaxRowDisposition(
+                $parent->getWeeeTaxRowDisposition() + $item->getWeeeTaxRowDisposition()
+            );
 
-            $parent->setBaseWeeeTaxAppliedAmount($parent->getBaseWeeeTaxAppliedAmount() + $item->getBaseWeeeTaxAppliedAmount());
-            $parent->setBaseWeeeTaxAppliedRowAmount($parent->getBaseWeeeTaxAppliedRowAmount() + $item->getBaseWeeeTaxAppliedRowAmount());
+            $parent->setBaseWeeeTaxAppliedAmount(
+                $parent->getBaseWeeeTaxAppliedAmount() + $item->getBaseWeeeTaxAppliedAmount()
+            );
+            $parent->setBaseWeeeTaxAppliedRowAmount(
+                $parent->getBaseWeeeTaxAppliedRowAmount() + $item->getBaseWeeeTaxAppliedRowAmount()
+            );
 
-            $parent->setWeeeTaxAppliedAmount($parent->getWeeeTaxAppliedAmount() + $item->getWeeeTaxAppliedAmount());
-            $parent->setWeeeTaxAppliedRowAmount($parent->getWeeeTaxAppliedRowAmount() + $item->getWeeeTaxAppliedRowAmount());
+            $parent->setWeeeTaxAppliedAmount(
+                $parent->getWeeeTaxAppliedAmount() + $item->getWeeeTaxAppliedAmount()
+            );
+            $parent->setWeeeTaxAppliedRowAmount(
+                $parent->getWeeeTaxAppliedRowAmount() + $item->getWeeeTaxAppliedRowAmount()
+            );
         }
 
         if ($applied) {
diff --git a/app/code/core/Mage/Weee/etc/config.xml b/app/code/core/Mage/Weee/etc/config.xml
index 7adb823477..aaf68f5b2c 100644
--- a/app/code/core/Mage/Weee/etc/config.xml
+++ b/app/code/core/Mage/Weee/etc/config.xml
@@ -264,6 +264,13 @@
                 <include_in_subtotal>0</include_in_subtotal>
             </weee>
         </tax>
+        <general>
+            <validator_data>
+                <input_types>
+                    <weee>weee</weee>
+                </input_types>
+            </validator_data>
+        </general>
     </default>
 
     <frontend>
diff --git a/app/code/core/Mage/Widget/Model/Widget/Instance.php b/app/code/core/Mage/Widget/Model/Widget/Instance.php
index ba9764adcd..32b8058f2a 100644
--- a/app/code/core/Mage/Widget/Model/Widget/Instance.php
+++ b/app/code/core/Mage/Widget/Model/Widget/Instance.php
@@ -74,8 +74,9 @@ protected function _construct()
             'all_products' => self::SINGLE_PRODUCT_LAYOUT_HANLDE,
         );
         foreach (Mage_Catalog_Model_Product_Type::getTypes() as $typeId => $type) {
-            $this->_layoutHandles[$typeId.'_products'] = str_replace('{{TYPE}}', $typeId, self::PRODUCT_TYPE_LAYOUT_HANDLE) ;
-            $this->_specificEntitiesLayoutHandles[$typeId.'_products'] = self::SINGLE_PRODUCT_LAYOUT_HANLDE;
+            $layoutHandle = str_replace('{{TYPE}}', $typeId, self::PRODUCT_TYPE_LAYOUT_HANDLE);
+            $this->_layoutHandles[$typeId . '_products'] = $layoutHandle;
+            $this->_specificEntitiesLayoutHandles[$typeId . '_products'] = self::SINGLE_PRODUCT_LAYOUT_HANLDE;
         }
     }
 
@@ -474,16 +475,22 @@ public function generateLayoutUpdateXml($blockReference, $templatePath = '')
         if ($templatePath) {
             $template = ' template="' . $templatePath . '"';
         }
-        $xml .= '<block type="' . $this->getType() . '" name="' . Mage::helper('core')->uniqHash() . '"' . $template . '>';
+
+        $hash = Mage::helper('core')->uniqHash();
+        $xml .= '<block type="' . $this->getType() . '" name="' . $hash . '"' . $template . '>';
         foreach ($parameters as $name => $value) {
             if (is_array($value)) {
                 $value = implode(',', $value);
             }
             if ($name && strlen((string)$value)) {
-                $xml .= '<action method="setData"><name>' . $name . '</name><value>' . Mage::helper('widget')->htmlEscape($value) . '</value></action>';
+                $xml .= '<action method="setData">'
+                    . '<name>' . $name . '</name>'
+                    . '<value>' . Mage::helper('widget')->htmlEscape($value) . '</value>'
+                    . '</action>';
             }
         }
         $xml .= '</block></reference>';
+
         return $xml;
     }
 
@@ -507,7 +514,7 @@ protected function _invalidateCache()
      */
     protected function _afterSave()
     {
-        if ($this->dataHasChangedFor('page_groups')) {
+        if ($this->dataHasChangedFor('page_groups') || $this->dataHasChangedFor('widget_parameters')) {
             $this->_invalidateCache();
         }
         return parent::_afterSave();
diff --git a/app/code/core/Mage/Wishlist/Block/Abstract.php b/app/code/core/Mage/Wishlist/Block/Abstract.php
index bd26d95d89..c3d2612ea6 100644
--- a/app/code/core/Mage/Wishlist/Block/Abstract.php
+++ b/app/code/core/Mage/Wishlist/Block/Abstract.php
@@ -178,6 +178,17 @@ public function getItemAddToCartUrl($item)
         return $this->_getHelper()->getAddToCartUrl($item);
     }
 
+    /**
+     * Retrieve Add Item to shopping cart URL from shared wishlist
+     *
+     * @param string|Mage_Catalog_Model_Product|Mage_Wishlist_Model_Item $item
+     * @return string
+     */
+    public function getSharedItemAddToCartUrl($item)
+    {
+        return $this->_getHelper()->getSharedAddToCartUrl($item);
+    }
+
     /**
      * Retrieve URL for adding Product to wishlist
      *
diff --git a/app/code/core/Mage/Wishlist/Helper/Data.php b/app/code/core/Mage/Wishlist/Helper/Data.php
index f0bac1cf75..90e778bd95 100644
--- a/app/code/core/Mage/Wishlist/Helper/Data.php
+++ b/app/code/core/Mage/Wishlist/Helper/Data.php
@@ -326,6 +326,28 @@ public function getAddToCartUrl($item)
         return $this->_getUrlStore($item)->getUrl('wishlist/index/cart', $params);
     }
 
+    /**
+     * Retrieve URL for adding item to shoping cart from shared wishlist
+     *
+     * @param string|Mage_Catalog_Model_Product|Mage_Wishlist_Model_Item $item
+     * @return  string
+     */
+    public function getSharedAddToCartUrl($item)
+    {
+        $continueUrl  = Mage::helper('core')->urlEncode(Mage::getUrl('*/*/*', array(
+            '_current'      => true,
+            '_use_rewrite'  => true,
+            '_store_to_url' => true,
+        )));
+
+        $urlParamName = Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED;
+        $params = array(
+            'item' => is_string($item) ? $item : $item->getWishlistItemId(),
+            $urlParamName => $continueUrl
+        );
+        return $this->_getUrlStore($item)->getUrl('wishlist/shared/cart', $params);
+    }
+
     /**
      * Retrieve url for adding item to shoping cart with b64 referer
      *
@@ -390,7 +412,13 @@ public function getRssUrl()
     {
         $customer = $this->_getCurrentCustomer();
         $key = $customer->getId().','.$customer->getEmail();
-        return $this->_getUrl('rss/index/wishlist', array('data' => Mage::helper('core')->urlEncode($key), '_secure' => false));
+        return $this->_getUrl(
+            'rss/index/wishlist',
+            array(
+                'data' => Mage::helper('core')->urlEncode($key),
+                '_secure' => false
+            )
+        );
     }
 
     /**
@@ -437,7 +465,9 @@ public function calculate()
                 $count = count($this->getWishlistItemCollection()->setInStockFilter(true));
             }
             $session->setWishlistDisplayType(Mage::getStoreConfig(self::XML_PATH_WISHLIST_LINK_USE_QTY));
-            $session->setDisplayOutOfStockProducts(Mage::getStoreConfig(self::XML_PATH_CATALOGINVENTORY_SHOW_OUT_OF_STOCK));
+            $session->setDisplayOutOfStockProducts(
+                Mage::getStoreConfig(self::XML_PATH_CATALOGINVENTORY_SHOW_OUT_OF_STOCK)
+            );
         }
         $session->setWishlistItemCount($count);
         Mage::dispatchEvent('wishlist_items_renewed');
diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php
index 71bd618fe4..0f9190f133 100644
--- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php
+++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php
@@ -180,7 +180,7 @@ protected function _assignProducts()
         foreach ($this as $item) {
             $product = $productCollection->getItemById($item->getProductId());
             if ($product) {
-                if ($this->_productInStock &&
+                if (!$this->_productInStock &&
                     !$product->isSalable() &&
                     !Mage::helper('cataloginventory')->isShowOutOfStock()) {
                         $this->removeItemByKey($item->getId());
@@ -327,7 +327,8 @@ public function addDaysInWishlist()
         $this->_addDaysInWishlist = true;
         $this->getSelect()->columns(array('days_in_wishlist' =>
             "(TO_DAYS('" . (substr(Mage::getSingleton('core/date')->date(), 0, -2) . '00') . "') ".
-            "- TO_DAYS(DATE_ADD(added_at, INTERVAL " .(int) Mage::getSingleton('core/date')->getGmtOffset() . " SECOND)))"));
+            "- TO_DAYS(DATE_ADD(added_at, INTERVAL ".(int) Mage::getSingleton('core/date')->getGmtOffset()." SECOND)))"
+        ));
         return $this;
     }
 
diff --git a/app/code/core/Mage/Wishlist/controllers/SharedController.php b/app/code/core/Mage/Wishlist/controllers/SharedController.php
index 82dbe76e89..714790ecee 100644
--- a/app/code/core/Mage/Wishlist/controllers/SharedController.php
+++ b/app/code/core/Mage/Wishlist/controllers/SharedController.php
@@ -65,7 +65,7 @@ public function indexAction()
         $wishlist   = $this->_getWishlist();
         $customerId = Mage::getSingleton('customer/session')->getCustomerId();
 
-        if ($wishlist->getCustomerId() && $wishlist->getCustomerId() == $customerId) {
+        if ($wishlist && $wishlist->getCustomerId() && $wishlist->getCustomerId() == $customerId) {
             $this->_redirectUrl(Mage::helper('wishlist')->getListUrl());
             return;
         }
@@ -77,4 +77,55 @@ public function indexAction()
         $this->_initLayoutMessages('wishlist/session');
         $this->renderLayout();
     }
+
+    /**
+     * Add shared wishlist item to shopping cart
+     *
+     * If Product has required options - redirect
+     * to product view page with message about needed defined required options
+     *
+     */
+    public function cartAction()
+    {
+        $itemId = (int) $this->getRequest()->getParam('item');
+
+        /* @var $item Mage_Wishlist_Model_Item */
+        $item = Mage::getModel('wishlist/item')->load($itemId);
+
+
+        /* @var $session Mage_Wishlist_Model_Session */
+        $session    = Mage::getSingleton('wishlist/session');
+        $cart       = Mage::getSingleton('checkout/cart');
+
+        $redirectUrl = Mage::getUrl('*/*');
+
+        try {
+            $options = Mage::getModel('wishlist/item_option')->getCollection()
+                    ->addItemFilter(array($itemId));
+            $item->setOptions($options->getOptionsByItem($itemId));
+
+            $item->addToCart($cart);
+            $cart->save()->getQuote()->collectTotals();
+
+            if (Mage::helper('checkout/cart')->getShouldRedirectToCart()) {
+                $redirectUrl = Mage::helper('checkout/cart')->getCartUrl();
+            } else if ($this->_getRefererUrl()) {
+                $redirectUrl = $this->_getRefererUrl();
+            }
+        } catch (Mage_Core_Exception $e) {
+            if ($e->getCode() == Mage_Wishlist_Model_Item::EXCEPTION_CODE_NOT_SALABLE) {
+                $session->addError(Mage::helper('wishlist')->__('This product(s) is currently out of stock'));
+            } else if ($e->getCode() == Mage_Wishlist_Model_Item::EXCEPTION_CODE_HAS_REQUIRED_OPTIONS) {
+                Mage::getSingleton('catalog/session')->addNotice($e->getMessage());
+                $redirectUrl = Mage::getUrl('*/*/configure/', array('id' => $item->getId()));
+            } else {
+                Mage::getSingleton('catalog/session')->addNotice($e->getMessage());
+                $redirectUrl = Mage::getUrl('*/*/configure/', array('id' => $item->getId()));
+            }
+        } catch (Exception $e) {
+            $session->addException($e, Mage::helper('wishlist')->__('Cannot add item to shopping cart'));
+        }
+
+        return $this->_redirectUrl($redirectUrl);
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/History/Grid.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/History/Grid.php
index b4edcb4f24..47f9c31fb6 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/History/Grid.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/History/Grid.php
@@ -70,18 +70,21 @@ protected function _prepareColumns()
             'align'     => 'left',
             'index'     => 'title',
             'type'      => 'text',
+            'escape'    => true
         ));
 
         $this->addColumn('name', array(
             'header'    => $this->__('App Name'),
             'align'     => 'left',
             'index'     => 'name',
+            'escape'    => true
         ));
 
         $this->addColumn('code', array(
             'header'    => $this->__('App Code'),
             'align'     => 'left',
             'index'     => 'code',
+            'escape'    => true
         ));
 
         $this->addColumn('created_at', array(
@@ -95,6 +98,7 @@ protected function _prepareColumns()
             'header'    => $this->__('Activation Key'),
             'align'     => 'left',
             'index'     => 'activation_key',
+            'escape'    => true
         ));
         return parent::_prepareColumns();
     }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit.php
index ab0a062769..46e7c466c9 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit.php
@@ -34,9 +34,8 @@ public function __construct()
         $this->_controller  = 'adminhtml_mobile';
         $this->_blockGroup  = 'xmlconnect';
         parent::__construct();
-        $app = $this->getApplication();
-
         if ((bool)!Mage::getSingleton('adminhtml/session')->getNewApplication()) {
+            $app = Mage::helper('xmlconnect')->getApplication();
             $this->_updateButton('save', 'label', $this->__('Save'));
             $this->_updateButton('save', 'onclick', 'if (editForm.submit()) {disableElements(\'save\')}');
 
@@ -58,7 +57,7 @@ public function __construct()
                 .'if (editForm.submit($(\'edit_form\').action + \'back/edit/\')) {disableElements(\'save\')};}';
             if ($app->getId()) {
                 $this->_formScripts[] = 'function saveAndSubmitApp() {'
-                    .'if (editForm.submit($(\'edit_form\').action+\'submitapp/' . $app->getId() . '\')) {'
+                    .'if (editForm.submit($(\'edit_form\').action + \'submitapp/' . $app->getId() . '\')) {'
                     .'disableElements(\'save\')};}';
             }
         } else {
@@ -73,24 +72,38 @@ public function __construct()
     }
 
     /**
-     * Retrieve currently edited application object
-     *
-     * @return Mage_XmlConnect_Model_Application
-     */
-    public function getApplication()
-    {
-        return Mage::registry('current_app');
-    }
-
-    /**
-     * Adding JS scripts to block
+     * Adding JS scripts and styles to block
      *
+     * @throws Mage_Core_Exception
      * @return Mage_Adminhtml_Block_Widget_Form_Container
      */
     protected function _prepareLayout()
     {
         $this->getLayout()->getBlock('head')->addJs('jscolor/jscolor.js');
         $this->getLayout()->getBlock('head')->addJs('scriptaculous/scriptaculous.js');
+
+        if ((bool)!Mage::getSingleton('adminhtml/session')->getNewApplication()) {
+            $deviceType = Mage::helper('xmlconnect')->getDeviceType();
+            switch ($deviceType) {
+                case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE:
+                    $this->getLayout()->getBlock('head')->addItem('skin_css', 'xmlconnect/mobile-home.css');
+                    $this->getLayout()->getBlock('head')->addItem('skin_css', 'xmlconnect/mobile-catalog.css');
+                    break;
+                case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPAD:
+                    $this->getLayout()->getBlock('head')->addItem('skin_css', 'xmlconnect/mobile-ipad-home.css');
+                    $this->getLayout()->getBlock('head')->addItem('skin_css', 'xmlconnect/mobile-ipad-catalog.css');
+                    break;
+                case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_ANDROID:
+                    $this->getLayout()->getBlock('head')->addItem('skin_css', 'xmlconnect/mobile-android.css');
+                    break;
+                default:
+                    Mage::throwException(
+                        $this->__('Device doesn\'t recognized: "%s". Unable to load preview model.', $deviceType)
+                    );
+                    break;
+            }
+        }
+
         return parent::_prepareLayout();
     }
 
@@ -101,8 +114,11 @@ protected function _prepareLayout()
      */
     public function getHeaderText()
     {
-        $app = $this->getApplication();
-        if ($app && $app->getId()) {
+        if ((bool)!Mage::getSingleton('adminhtml/session')->getNewApplication()) {
+            $app = Mage::helper('xmlconnect')->getApplication();
+        }
+
+        if (isset($app) && $app->getId()) {
             return $this->__('Edit App "%s"', $this->htmlEscape($app->getName()));
         } else {
             return $this->__('New App');
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Cache.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Cache.php
new file mode 100755
index 0000000000..91b28a316e
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Cache.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Tab for Cache Management
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Cache extends Mage_Adminhtml_Block_Widget_Form
+    implements Mage_Adminhtml_Block_Widget_Tab_Interface
+{
+    /**
+     * Prepare form before rendering HTML
+     * Setting Form Fieldsets and fields
+     *
+     * @return Mage_Adminhtml_Block_Widget_Form
+     */
+    protected function _prepareForm()
+    {
+        $form = new Varien_Data_Form();
+        $this->setForm($form);
+
+        $data = Mage::helper('xmlconnect')->getApplication()->getFormData();
+
+        $fieldset = $form->addFieldset('cache_management', array('legend' => $this->__('Cache Management')));
+        if (isset($data['conf[native][cacheLifetime]'])) {
+            $lifetime = $data['conf[native][cacheLifetime]'];
+        } else {
+            $lifetime = Mage::helper('xmlconnect')->getDefaultCacheLifetime();
+        }
+        $fieldset->addField('conf/native/cacheLifetime', 'text', array(
+            'label'     => $this->__('Cache Lifetime (seconds)'),
+            'name'      => 'conf[native][cacheLifetime]',
+            'value'     => $lifetime,
+            'note'      => $this->__('If you want to disable the cache on the application side, leave the field empty. Warning! When disabling cache, the application will take time to load each page.'),
+        ));
+
+        return parent::_prepareForm();
+    }
+
+    /**
+     * Tab label getter
+     *
+     * @return string
+     */
+    public function getTabLabel()
+    {
+        return $this->__('Cache Management');
+    }
+
+    /**
+     * Tab title getter
+     *
+     * @return string
+     */
+    public function getTabTitle()
+    {
+        return $this->__('Cache Management');
+    }
+
+    /**
+     * Check if tab can be shown
+     *
+     * @return bool
+     */
+    public function canShowTab()
+    {
+        return false;
+//        return (bool) !Mage::getSingleton('adminhtml/session')->getNewApplication();
+    }
+
+    /**
+     * Check if tab hidden
+     *
+     * @return bool
+     */
+    public function isHidden()
+    {
+        return false;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Content.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Content.php
index a0064c1af5..b345e31f93 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Content.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Content.php
@@ -84,7 +84,7 @@ protected function _prepareForm()
             'before_element_html' => $this->__('Get Content from CMS Page').'</td><td class="label">',
         ));
 
-        if (isset($conf['native']['pages'])) {
+        if (!empty($conf['native']['pages'])) {
             foreach ($conf['native']['pages'] as $key=>$dummy) {
                 $this->_addPage($fieldset, 'conf[native][pages]['.$key.']');
             }
@@ -117,7 +117,7 @@ public function getTabTitle()
     }
 
     /**
-     * Returns status flag about this tab can be showen or not
+     * Returns status flag about this tab can be shown or not
      *
      * @return true
      */
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Images.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Images.php
index 20af6c6d79..d3ca734a6e 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Images.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Images.php
@@ -23,7 +23,8 @@
  * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Design_Accordion_Images extends Mage_XmlConnect_Block_Adminhtml_Mobile_Widget_Form
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Design_Accordion_Images
+    extends Mage_XmlConnect_Block_Adminhtml_Mobile_Widget_Form
 {
     /**
      * Getter for accordion item title
@@ -61,25 +62,25 @@ protected function _prepareForm()
             'conf[native][navigationBar][icon]',
             $this->__('Logo in Header'),
             $this->__('Recommended size 35px x 35px.'),
-            $this->_getDesignPreviewImageUrl(Mage::helper('xmlconnect/image')->getInterfaceImagesPaths('conf/native/navigationBar/icon')),
+            $this->_getDesignPreviewImageUrl('conf/native/navigationBar/icon'),
             true
         );
 
-        $deviceType = Mage::helper('xmlconnect')->getApplication()->getType();
+        $deviceType = Mage::helper('xmlconnect')->getDeviceType();
         switch ($deviceType) {
             case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE:
                 $this->addImage($fieldset,
                     'conf[native][body][bannerImage]',
                     $this->__('Banner on Home Screen'),
                     $this->__('Recommended size 320px x 230px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.'),
-                    $this->_getDesignPreviewImageUrl(Mage::helper('xmlconnect/image')->getInterfaceImagesPaths('conf/native/body/bannerImage')),
+                    $this->_getDesignPreviewImageUrl('conf/native/body/bannerImage'),
                     true
                 );
                 $this->addImage($fieldset,
                     'conf[native][body][backgroundImage]',
                     $this->__('App Background'),
                     $this->__('Recommended size 320px x 367px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance.'),
-                    $this->_getDesignPreviewImageUrl(Mage::helper('xmlconnect/image')->getInterfaceImagesPaths('conf/native/body/backgroundImage')),
+                    $this->_getDesignPreviewImageUrl('conf/native/body/backgroundImage'),
                     true
                 );
                 break;
@@ -88,21 +89,21 @@ protected function _prepareForm()
                     'conf[native][body][bannerIpadImage]',
                     $this->__('Banner on Home Screen'),
                     $this->__('Recommended size 768px x 294px. Note: Image size affects the performance of your app.'),
-                    $this->_getDesignPreviewImageUrl(Mage::helper('xmlconnect/image')->getInterfaceImagesPaths('conf/native/body/bannerIpadImage')),
+                    $this->_getDesignPreviewImageUrl('conf/native/body/bannerIpadImage'),
                     true
                 );
                 $this->addImage($fieldset,
                     'conf[native][body][backgroundIpadLandscapeImage]',
-                    $this->__('App Background (landscape mode)'),
+                    $this->__('App Background <br />(landscape mode)'),
                     $this->__('Recommended size 1024px x 704px. Note: Image size affects the performance of your app.'),
-                    $this->_getDesignPreviewImageUrl(Mage::helper('xmlconnect/image')->getInterfaceImagesPaths('conf/native/body/backgroundIpadLandscapeImage')),
+                    $this->_getDesignPreviewImageUrl('conf/native/body/backgroundIpadLandscapeImage'),
                     true
                 );
                 $this->addImage($fieldset,
                     'conf[native][body][backgroundIpadPortraitImage]',
-                    $this->__('App Background (portrait mode)'),
+                    $this->__('App Background <br />(portrait mode)'),
                     $this->__('Recommended size 768px x 960px. Note: Image size affects the performance of your app.'),
-                    $this->_getDesignPreviewImageUrl(Mage::helper('xmlconnect/image')->getInterfaceImagesPaths('conf/native/body/backgroundIpadPortraitImage')),
+                    $this->_getDesignPreviewImageUrl('conf/native/body/backgroundIpadPortraitImage'),
                     true
                 );
                 break;
@@ -111,30 +112,18 @@ protected function _prepareForm()
                     'conf[native][body][bannerAndroidImage]',
                     $this->__('Banner on Home Screen'),
                     $this->__('Recommended size 320px x 258px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.'),
-                    $this->_getDesignPreviewImageUrl(Mage::helper('xmlconnect/image')->getInterfaceImagesPaths('conf/native/body/bannerAndroidImage')),
-                    true
-                );
-                $this->addImage($fieldset,
-                    'conf[native][body][backgroundAndroidLandscapeImage]',
-                    $this->__('App Background (landscape mode)'),
-                    $this->__('Recommended size 480px x 250px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance.'),
-                    $this->_getDesignPreviewImageUrl(Mage::helper('xmlconnect/image')->getInterfaceImagesPaths('conf/native/body/backgroundAndroidLandscapeImage')),
-                    true
-                );
-                $this->addImage($fieldset,
-                    'conf[native][body][backgroundAndroidPortraitImage]',
-                    $this->__('App Background (portrait mode)'),
-                    $this->__('Recommended size 320px x 410px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance.'),
-                    $this->_getDesignPreviewImageUrl(Mage::helper('xmlconnect/image')->getInterfaceImagesPaths('conf/native/body/backgroundAndroidPortraitImage')),
+                    $this->_getDesignPreviewImageUrl('conf/native/body/bannerAndroidImage'),
                     true
                 );
                 break;
             default:
-                Mage::throwException($this->__('Device doesn\'t recognized: "%s". Unable to load a helper.', $deviceType));
+                Mage::throwException(
+                    $this->__('Device doesn\'t recognized: "%s". Unable to load a helper.', $deviceType)
+                );
                 break;
         }
 
-        $form->setValues($this->getApplication()->getFormData());
+        $form->setValues(Mage::helper('xmlconnect')->getApplication()->getFormData());
         $this->setForm($form);
         return parent::_prepareForm();
     }
@@ -147,6 +136,7 @@ protected function _prepareForm()
     */
     protected function _getDesignPreviewImageUrl($name)
     {
-        return Mage::helper('xmlconnect/image')->getSkinImagesUrl('design_default/' . $name);
+        $name = Mage::helper('xmlconnect/image')->getInterfaceImagesPaths($name);
+        return Mage::helper('xmlconnect/image')->getDefaultDesignUrl($name);
     }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Tabs.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Tabs.php
index 0970b2cbfe..9a3e73b117 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Tabs.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Tabs.php
@@ -23,7 +23,16 @@
  * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Design_Accordion_Tabs extends Mage_XmlConnect_Block_Adminhtml_Mobile_Widget_Form
+
+/**
+ * Device tabs accourdion block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Design_Accordion_Tabs
+    extends Mage_XmlConnect_Block_Adminhtml_Mobile_Widget_Form
 {
     /**
      * Getter for accordion item title
@@ -32,7 +41,7 @@ class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Design_Accordion_Tabs exte
      */
     public function getTitle()
     {
-        if (Mage::helper('xmlconnect')->getApplication()->getType() == Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPAD) {
+        if (Mage::helper('xmlconnect')->getDeviceType() == Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPAD) {
             $title = $this->__('Extensions');
         } else {
             $title = $this->__('Tabs');
@@ -63,7 +72,7 @@ protected function _prepareForm()
         $this->_addElementTypes($fieldset);
         $fieldset->addField('conf[extra][tabs]', 'tabs', array('name' => 'conf[extra][tabs]'));
 
-        $form->setValues($this->getApplication()->getFormData());
+        $form->setValues(Mage::helper('xmlconnect')->getApplication()->getFormData());
         $this->setForm($form);
         return parent::_prepareForm();
     }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Themes.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Themes.php
index 36c3eb76f7..1b69c66f1b 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Themes.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Themes.php
@@ -23,7 +23,16 @@
  * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Design_Accordion_Themes extends Mage_XmlConnect_Block_Adminhtml_Mobile_Widget_Form
+
+/**
+ * Device design themes accordion block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Design_Accordion_Themes
+    extends Mage_XmlConnect_Block_Adminhtml_Mobile_Widget_Form
 {
     /**
      * Getter for accordion item title
@@ -60,7 +69,7 @@ protected function _prepareForm()
             'name'      => 'theme',
             'themes'    => Mage::helper('xmlconnect/theme')->getAllThemes(),
         ));
-        $form->setValues($this->getApplication()->getFormData());
+        $form->setValues(Mage::helper('xmlconnect')->getApplication()->getFormData());
         $this->setForm($form);
 
         return parent::_prepareForm();
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Preview.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Preview.php
index cc969aa0c8..9918c4cf3f 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Preview.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Preview.php
@@ -32,7 +32,7 @@ public function __construct()
     {
         parent::__construct();
 
-        $device = Mage::helper('xmlconnect')->getApplication()->getType();
+        $device = Mage::helper('xmlconnect')->getDeviceType();
         if (array_key_exists($device, Mage::helper('xmlconnect')->getSupportedDevices())) {
             $template = 'xmlconnect/edit/tab/design/preview_' . strtolower($device) . '.phtml';
         } else {
@@ -56,7 +56,7 @@ public function getPreviewActionUrl($page = 'home')
             if ($model->getId() !== null) {
                 $params = array('application_id' => $model->getId());
             } else {
-                $params = array('devtype' => $model->getDevtype());
+                $params = array('devtype' => $model->getType());
             }
 
         }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Themes.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Themes.php
index 4790af6e4d..73a865d35b 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Themes.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Themes.php
@@ -23,6 +23,14 @@
  * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
+
+/**
+ * Device design themes block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
 class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Design_Themes extends Mage_Adminhtml_Block_Template
 {
     /**
@@ -37,24 +45,72 @@ public function __construct()
         $this->setTemplate('xmlconnect/form/element/themes.phtml');
 
         $data = $model->getFormData();
-        $this->setColorFieldset (array (
-            array ( 'id' => 'field_colors', 'label' =>   $this->__('Colors'), 'fields' => array (
-                $this->_addColorBox('conf[native][navigationBar][tintColor]', $this->__('Header Background Color'), $data),
-                $this->_addColorBox('conf[native][body][primaryColor]', $this->__('Primary Color'), $data),
-                $this->_addColorBox('conf[native][body][secondaryColor]', $this->__('Secondary Color'), $data),
-                $this->_addColorBox('conf[native][categoryItem][backgroundColor]', $this->__('Category Item Background Color'), $data),
-                $this->_addColorBox('conf[native][categoryItem][tintColor]', $this->__('Category Button Color'), $data),
+        $this->setColorFieldset(array(
+            array('id' => 'field_colors', 'label' => $this->__('Colors'), 'fields' => array(
+                $this->_addColorBox(
+                    'conf[native][navigationBar][tintColor]',
+                    $this->__('Header Background Color'),
+                    $data
+                ),
+                $this->_addColorBox(
+                    'conf[native][body][primaryColor]',
+                    $this->__('Primary Color'),
+                    $data
+                ),
+                $this->_addColorBox(
+                    'conf[native][body][secondaryColor]',
+                    $this->__('Secondary Color'),
+                    $data
+                ),
+                $this->_addColorBox(
+                    'conf[native][categoryItem][backgroundColor]',
+                    $this->__('Category Item Background Color'),
+                    $data
+                ),
+                $this->_addColorBox(
+                    'conf[native][categoryItem][tintColor]',
+                    $this->__('Category Button Color'),
+                    $data
+                ),
             )),
-            array ( 'id' => 'field_fonts', 'label' =>   $this->__('Fonts'), 'fields' => array (
-                $this->_addColorBox('conf[extra][fontColors][header]', $this->__('Header Font Color'), $data),
-                $this->_addColorBox('conf[extra][fontColors][primary]', $this->__('Primary Font Color'), $data),
-                $this->_addColorBox('conf[extra][fontColors][secondary]', $this->__('Secondary Font Color'), $data),
-                $this->_addColorBox('conf[extra][fontColors][price]', $this->__('Price Font Color'), $data),
+            array('id' => 'field_fonts', 'label' => $this->__('Fonts'), 'fields' => array(
+                $this->_addColorBox(
+                    'conf[extra][fontColors][header]',
+                    $this->__('Header Font Color'),
+                    $data
+                ),
+                $this->_addColorBox(
+                    'conf[extra][fontColors][primary]',
+                    $this->__('Primary Font Color'),
+                    $data
+                ),
+                $this->_addColorBox(
+                    'conf[extra][fontColors][secondary]',
+                    $this->__('Secondary Font Color'),
+                    $data
+                ),
+                $this->_addColorBox(
+                    'conf[extra][fontColors][price]',
+                    $this->__('Price Font Color'),
+                    $data
+                ),
             )),
-            array ( 'id' => 'field_advanced', 'label' =>  $this->__('Advanced Settings'), 'fields' => array (
-                $this->_addColorBox('conf[native][body][backgroundColor]', $this->__('Background Color'), $data),
-                $this->_addColorBox('conf[native][body][scrollBackgroundColor]', $this->__('Scroll Background Color'), $data),
-                $this->_addColorBox('conf[native][itemActions][relatedProductBackgroundColor]', $this->__('Related Product Background Color'), $data),
+            array('id' => 'field_advanced', 'label' => $this->__('Advanced Settings'), 'fields' => array(
+                $this->_addColorBox(
+                    'conf[native][body][backgroundColor]',
+                    $this->__('Background Color'),
+                    $data
+                ),
+                $this->_addColorBox(
+                    'conf[native][body][scrollBackgroundColor]',
+                    $this->__('Scroll Background Color'),
+                    $data
+                ),
+                $this->_addColorBox(
+                    'conf[native][itemActions][relatedProductBackgroundColor]',
+                    $this->__('Related Product Background Color'),
+                    $data
+                ),
             )),
         ));
     }
@@ -67,6 +123,7 @@ public function __construct()
     public function getAllThemes()
     {
         $result = array();
+
         foreach ($this->getThemes() as $theme) {
             $result[$theme->getName()] = $theme->getFormData();
         }
@@ -98,7 +155,7 @@ protected function _addColorBox($id, $label, $data)
      */
     public function getDefaultThemeLoaded()
     {
-        return $this->getApplication()->getDefaultThemeLoaded();
+        return Mage::helper('xmlconnect')->getApplication()->getDefaultThemeLoaded();
     }
 
     /**
@@ -108,7 +165,7 @@ public function getDefaultThemeLoaded()
      */
     public function isNewApplication()
     {
-        return $this->getApplication()->getId() ? false : true;
+        return Mage::helper('xmlconnect')->getApplication()->getId() ? false : true;
     }
 
     /**
@@ -130,14 +187,4 @@ public function getResetThemeActionUrl()
     {
         return $this->getUrl('*/*/resetTheme');
     }
-
-    /**
-     * Getter for current loaded application model
-     *
-     * @return Mage_XmlConnect_Model_Application
-     */
-    public function getApplication()
-    {
-        return Mage::helper('xmlconnect')->getApplication();
-    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Flurryanalytics.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Flurryanalytics.php
index 9d940a6034..41dbbfb49c 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Flurryanalytics.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Flurryanalytics.php
@@ -51,20 +51,28 @@ protected function _prepareForm()
 
         $this->setForm($form);
 
-        $data = $this->getApplication()->getFormData();
+        $data = Mage::helper('xmlconnect')->getApplication()->getFormData();
         $yesNoValues = Mage::getModel('adminhtml/system_config_source_yesno')->toOptionArray();
 
         $fieldset = $form->addFieldset('flurryAnalytics', array('legend' => $this->__('Flurry Analytics')));
 
+        if (isset($data['conf[native][merchantFlurryTracking][isActive]'])) {
+            $isActiveValue = $data['conf[native][merchantFlurryTracking][isActive]'];
+        } else {
+            $isActiveValue = '0';
+        }
+
         $enabled = $fieldset->addField('conf/native/merchantFlurryTracking/isActive', 'select', array(
             'label'     => $this->__('Enable Flurry Analytics'),
             'name'      => 'conf[native][merchantFlurryTracking][isActive]',
             'values'    => $yesNoValues,
             'note'      => $this->__('Enable Flurry Analytics for the merchant.'),
-            'value'     => (isset($data['conf[native][merchantFlurryTracking][isActive]']) ? $data['conf[native][merchantFlurryTracking][isActive]'] : '0')
+            'value'     => $isActiveValue
         ));
 
-        $flurryAnalyticsUrl = $this->escapeHtml(Mage::getStoreConfig('xmlconnect/flurry_analytics/statistics_url'));
+        $flurryAnalyticsUrl = $this->escapeHtml(
+            Mage::getStoreConfig('xmlconnect/flurry_analytics/statistics_url')
+        );
 
         $flurryLink = $fieldset->addField('flurry_analytics_link', 'link', array(
             'title'     => $this->__('Flurry Analytics Site'),
@@ -75,24 +83,30 @@ protected function _prepareForm()
             'note'      => $this->__('You can watch statistics here.'),
         ));
 
+        if (isset($data['conf[native][merchantFlurryTracking][accountId]'])) {
+            $accountIdValue = $data['conf[native][merchantFlurryTracking][accountId]'];
+        } else {
+            $accountIdValue = '';
+        }
+
         $flurryApiCode = $fieldset->addField('conf/native/merchantFlurryTracking/accountId', 'text', array(
-            'label'     => $this->__('Flurry Api Code'),
+            'label'     => $this->__('Flurry API Code'),
             'name'      => 'conf[native][merchantFlurryTracking][accountId]',
             'enabled'   => true,
             'required'  => true,
-            'value'     => (isset($data['conf[native][merchantFlurryTracking][accountId]']) ? $data['conf[native][merchantFlurryTracking][accountId]'] : '')
+            'value'     => $accountIdValue
         ));
 
         // field dependencies
-        $this->setChild('form_after', $this->getLayout()->createBlock('adminhtml/widget_form_element_dependence')
+        $this->setChild('form_after', $this->getLayout()
+            ->createBlock('adminhtml/widget_form_element_dependence')
             ->addFieldMap($flurryApiCode->getHtmlId(), $flurryApiCode->getName())
             ->addFieldMap($enabled->getHtmlId(), $enabled->getName())
             ->addFieldDependence(
                 $flurryApiCode->getName(),
                 $enabled->getName(),
-                1)
-        );
-
+                1
+        ));
         return parent::_prepareForm();
     }
 
@@ -124,7 +138,7 @@ public function getTabTitle()
     public function canShowTab()
     {
         return (bool) !Mage::getSingleton('adminhtml/session')->getNewApplication()
-            && $this->getApplication()->getType() == Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE;
+            && Mage::helper('xmlconnect')->getDeviceType() == Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE;
     }
 
     /**
@@ -137,4 +151,3 @@ public function isHidden()
         return false;
     }
 }
-
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/General.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/General.php
index 69d38bf13a..83c887e0af 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/General.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/General.php
@@ -42,7 +42,8 @@ protected function _prepareForm()
 
         if ($model->getId()) {
             $fieldset->addField('application_id', 'hidden', array(
-                'name' => 'application_id',
+                'name'  => 'application_id',
+                'value' => $model->getId()
             ));
         }
 
@@ -51,13 +52,15 @@ protected function _prepareForm()
             'label'     => $this->__('App Name'),
             'title'     => $this->__('App Name'),
             'maxlength' => '250',
+            'value'     => $model->getName(),
             'required'  => true,
         ));
 
         if ($model->getId()) {
             $field = $fieldset->addField('code', 'label', array(
-                'label'     => $this->__('App Code'),
-                'title'     => $this->__('App Code'),
+                'label' => $this->__('App Code'),
+                'title' => $this->__('App Code'),
+                'value' => $model->getCode(),
             ));
         }
 
@@ -81,6 +84,7 @@ protected function _prepareForm()
         }
 
         if ($model->getId()) {
+            $storeElement->setValue($model->getStoreId());
             $storeElement->setDisabled(true);
         }
 
@@ -93,8 +97,8 @@ protected function _prepareForm()
         ));
 
         $fieldset->addField('devtype', 'hidden', array(
-                'name'      => 'devtype',
-                'value'     => $model->getDevtype(),
+                'name'  => 'devtype',
+                'value' => $model->getType(),
         ));
 
         $yesNoValues = Mage::getModel('adminhtml/system_config_source_yesno')->toOptionArray();
@@ -103,10 +107,10 @@ protected function _prepareForm()
             'label'     => $this->__('Catalog Only App?'),
             'name'      => 'browsing_mode',
             'note'      => $this->__('A Catalog Only App will not support functions such as add to cart, add to wishlist, or login.'),
+            'value'     => $model->getBrowsingMode(),
             'values'    => $yesNoValues
         ));
 
-        $form->setValues($model->getFormData());
         $this->setForm($form);
         return parent::_prepareForm();
     }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Notification.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Notification.php
index 439475952d..0382e43ea8 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Notification.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Notification.php
@@ -23,7 +23,8 @@
  * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
-class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Notification extends Mage_XmlConnect_Block_Adminhtml_Mobile_Widget_Form
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Notification
+    extends Mage_XmlConnect_Block_Adminhtml_Mobile_Widget_Form
     implements Mage_Adminhtml_Block_Widget_Tab_Interface
 {
     /**
@@ -48,7 +49,7 @@ protected function _prepareForm()
 
         $this->setForm($form);
 
-        $data = $this->getApplication()->getFormData();
+        $data = Mage::helper('xmlconnect')->getApplication()->getFormData();
 
         $yesNoValues = Mage::getModel('adminhtml/system_config_source_yesno')->toOptionArray();
 
@@ -56,39 +57,69 @@ protected function _prepareForm()
             'legend'    => $this->__('Urban Airship Push Notification'),
         ));
 
+        if (isset($data['conf[native][notifications][isActive]'])) {
+            $notificationStatus = $data['conf[native][notifications][isActive]'];
+        } else {
+            $notificationStatus = '0';
+        }
+
         $notificationEnabled = $fieldset->addField('conf/native/notifisations/isActive', 'select', array(
             'label'     => $this->__('Enable AirMail Message Push notification'),
             'name'      => 'conf[native][notifications][isActive]',
             'values'    => $yesNoValues,
-            'value'     => (isset($data['conf[native][notifications][isActive]']) ? $data['conf[native][notifications][isActive]'] : '0'),
+            'value'     => $notificationStatus,
         ));
 
+        if (isset($data['conf[native][notifications][applicationKey]'])) {
+            $keyValue = $data['conf[native][notifications][applicationKey]'];
+        } else {
+            $keyValue = '';
+        }
+
         $applicationKey = $fieldset->addField('conf/native/notifications/applicationKey', 'text', array(
             'label'     => $this->__('Application Key'),
             'name'      => 'conf[native][notifications][applicationKey]',
-            'value'     => (isset($data['conf[native][notifications][applicationKey]']) ? $data['conf[native][notifications][applicationKey]'] : ''),
+            'value'     => $keyValue,
             'required'  => true
         ));
 
+        if (isset($data['conf[native][notifications][applicationSecret]'])) {
+            $secretValue = $data['conf[native][notifications][applicationSecret]'];
+        } else {
+            $secretValue = '';
+        }
+
         $applicationSecret = $fieldset->addField('conf/native/notifications/applicationSecret', 'text', array(
             'label'     => $this->__('Application Secret'),
             'name'      => 'conf[native][notifications][applicationSecret]',
-            'value'     => (isset($data['conf[native][notifications][applicationSecret]']) ? $data['conf[native][notifications][applicationSecret]'] : ''),
+            'value'     => $secretValue,
             'required'  => true
         ));
 
+        if (isset($data['conf[native][notifications][applicationMasterSecret]'])) {
+            $mSecretValue = $data['conf[native][notifications][applicationMasterSecret]'];
+        } else {
+            $mSecretValue = '';
+        }
 
-        $applicationMasterSecret = $fieldset->addField('conf/native/notifications/applicationMasterSecret', 'text', array(
+        $mSecretConfPath = 'conf/native/notifications/applicationMasterSecret';
+        $applicationMasterSecret = $fieldset->addField($mSecretConfPath, 'text', array(
             'label'     => $this->__('Application Master Secret'),
             'name'      => 'conf[native][notifications][applicationMasterSecret]',
-            'value'     => (isset($data['conf[native][notifications][applicationMasterSecret]']) ? $data['conf[native][notifications][applicationMasterSecret]'] : ''),
+            'value'     => $mSecretValue,
             'required'  => true
         ));
 
+        if (isset($data['conf[native][notifications][mailboxTitle]'])) {
+            $titleValue = $data['conf[native][notifications][mailboxTitle]'];
+        } else {
+            $titleValue = '';
+        }
+
         $mailboxTitle = $fieldset->addField('conf/native/notifications/mailboxTitle', 'text', array(
             'label'     => $this->__('Mailbox title'),
             'name'      => 'conf[native][notifications][mailboxTitle]',
-            'value'     => (isset($data['conf[native][notifications][mailboxTitle]']) ? $data['conf[native][notifications][mailboxTitle]'] : ''),
+            'value'     => $titleValue,
             'required'  => true,
             'note'      => $this->__('The Mailbox title will be shown in the More Info tab. To understand more about the title, please <a target="_blank" href="http://www.magentocommerce.com/img/product/mobile/helpers/mail_box_title.png">click here</a>')
         ));
@@ -117,7 +148,6 @@ protected function _prepareForm()
                 $notificationEnabled->getName(),
                 1)
             );
-
         return parent::_prepareForm();
     }
 
@@ -148,8 +178,8 @@ public function getTabTitle()
      */
     public function canShowTab()
     {
-        return (bool) !Mage::getSingleton('adminhtml/session')->getNewApplication() 
-            && $this->getApplication()->getType() == Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE;
+        return (bool) !Mage::getSingleton('adminhtml/session')->getNewApplication()
+            && Mage::helper('xmlconnect')->getDeviceType() == Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE;
     }
 
     /**
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Payment.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Payment.php
index 0320858cec..61fe6de466 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Payment.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Payment.php
@@ -51,61 +51,98 @@ protected function _prepareForm()
 
         $this->setForm($form);
 
-        $data = $this->getApplication()->getFormData();
+        $data = Mage::helper('xmlconnect')->getApplication()->getFormData();
         $yesNoValues = Mage::getModel('adminhtml/system_config_source_yesno')->toOptionArray();
 
         $fieldset = $form->addFieldset('onepage_checkout', array('legend' => $this->__('Standard Checkout')));
 
+        if (isset($data['conf[native][defaultCheckout][isActive]'])) {
+            $checkoutStatus = $data['conf[native][defaultCheckout][isActive]'];
+        } else {
+            $checkoutStatus = '1';
+        }
+
         $fieldset->addField('conf/native/defaultCheckout/isActive', 'select', array(
             'label'     => $this->__('Enable Standard Checkout'),
             'name'      => 'conf[native][defaultCheckout][isActive]',
-            'values'   => $yesNoValues,
+            'values'    => $yesNoValues,
             'note'      => $this->__('Standard Checkout uses the checkout methods provided by Magento. Only inline payment methods are supported. (e.g PayPal Direct,  Authorize.Net, etc.)'),
-            'value'     => (isset($data['conf[native][defaultCheckout][isActive]']) ? $data['conf[native][defaultCheckout][isActive]'] : '1')
+            'value'     => $checkoutStatus
         ));
 
-
-        /**
-         * PayPal MEP management
-         */
-        $isExpressCheckoutAvaliable = Mage::getModel('xmlconnect/payment_method_paypal_mep')->isAvailable(null);
-
-        $paypalActive = 0;
-        if (isset($data['conf[native][paypal][isActive]'])) {
-            $paypalActive = (int)($data['conf[native][paypal][isActive]'] && $isExpressCheckoutAvaliable);
+        $deviceType = Mage::helper('xmlconnect')->getDeviceType();
+        switch ($deviceType) {
+            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE:
+            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPAD:
+                /**
+                 * PayPal MEP management
+                 */
+                $isExpressCheckoutAvaliable = Mage::getModel('xmlconnect/payment_method_paypal_mep')->isAvailable(null);
+
+                $paypalActive = 0;
+                if (isset($data['conf[native][paypal][isActive]'])) {
+                    $paypalActive = (int)($data['conf[native][paypal][isActive]'] && $isExpressCheckoutAvaliable);
+                }
+                $fieldsetPaypal = $form->addFieldset('paypal_mep_checkout', array(
+                    'legend' => $this->__('PayPal Mobile Embedded Payment (MEP)')
+                ));
+
+                $activateMepMethodNote = $this->__('To activate PayPal MEP payment method activate Express checkout first. ');
+
+                $paypalConfigurationUrl = $this->escapeHtml(
+                    $this->getUrl('adminhtml/system_config/edit', array('section' => 'paypal'))
+                );
+
+                $businessAccountNote = $this->__('MEP is PayPal`s native checkout experience for the iPhone. You can choose to use MEP alongside standard checkout, or use it as your only checkout method for Magento mobile. PayPal MEP requires a <a href="%s">PayPal business account</a>', $paypalConfigurationUrl);
+
+                $paypalActiveField = $fieldsetPaypal->addField('conf/native/paypal/isActive', 'select', array(
+                    'label'     => $this->__('Activate PayPal Checkout'),
+                    'name'      => 'conf[native][paypal][isActive]',
+                    'note'      => (!$isExpressCheckoutAvaliable ? $activateMepMethodNote : $businessAccountNote),
+                    'values'    => $yesNoValues,
+                    'value'     => $paypalActive,
+                    'disabled'  => !$isExpressCheckoutAvaliable
+                ));
+
+                if (isset($data['conf[special][merchantLabel]'])) {
+                    $merchantLabelValue = $data['conf[special][merchantLabel]'];
+                } else {
+                    $merchantLabelValue = '';
+                }
+                $merchantlabelField = $fieldsetPaypal->addField('conf/special/merchantLabel', 'text', array(
+                    'name'      => 'conf[special][merchantLabel]',
+                    'label'     => $this->__('Merchant Label'),
+                    'title'     => $this->__('Merchant Label'),
+                    'required'  => true,
+                    'value'     => $merchantLabelValue
+                ));
+
+                // field dependencies
+                $this->setChild('form_after', $this->getLayout()
+                    ->createBlock('adminhtml/widget_form_element_dependence')
+                    ->addFieldMap($merchantlabelField->getHtmlId(), $merchantlabelField->getName())
+                    ->addFieldMap($paypalActiveField->getHtmlId(), $paypalActiveField->getName())
+                    ->addFieldDependence(
+                        $merchantlabelField->getName(),
+                        $paypalActiveField->getName(),
+                        1)
+                );
+                break;
+            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_ANDROID:
+                $fieldsetPaypal = $form->addFieldset('paypal_mep_checkout', array(
+                    'legend' => $this->__('PayPal Mobile Embedded Payment (MEP)')
+                ));
+                $fieldsetPaypal->addField('paypal_note', 'note', array(
+                    'label' => $this->__('Notice'),
+                    'text'  => $this->__('Currently, PayPal MEP is not available for the Android application')
+                ));
+                break;
+            default:
+                Mage::throwException(
+                    $this->__('Device doesn\'t recognized: "%s". Unable to load preview model.', $deviceType)
+                );
+                break;
         }
-        $fieldsetPaypal = $form->addFieldset('paypal_mep_checkout', array('legend' => $this->__('PayPal Mobile Embedded Payment (MEP)')));
-
-        $activateMepMethodNote = $this->__('To activate PayPal MEP payment method activate Express checkout first. ');
-        $paypalConfigurationUrl = $this->escapeHtml($this->getUrl('adminhtml/system_config/edit', array('section' => 'paypal')));
-        $businessAccountNote = $this->__('MEP is PayPal`s native checkout experience for the iPhone. You can choose to use MEP alongside standard checkout, or use it as your only checkout method for Magento mobile. PayPal MEP requires a <a href="%s">PayPal business account</a>', $paypalConfigurationUrl);
-
-        $paypalActiveField = $fieldsetPaypal->addField('conf/native/paypal/isActive', 'select', array(
-            'label'     => $this->__('Activate PayPal Checkout'),
-            'name'      => 'conf[native][paypal][isActive]',
-            'note'      => (!$isExpressCheckoutAvaliable ? $activateMepMethodNote : $businessAccountNote),
-            'values'    => $yesNoValues,
-            'value'     => $paypalActive,
-            'disabled'  => !$isExpressCheckoutAvaliable
-        ));
-
-        $merchantlabelField = $fieldsetPaypal->addField('conf/special/merchantLabel', 'text', array(
-            'name'      => 'conf[special][merchantLabel]',
-            'label'     => $this->__('Merchant Label'),
-            'title'     => $this->__('Merchant Label'),
-            'required'  => true,
-            'value'     => (isset($data['conf[special][merchantLabel]']) ? $data['conf[special][merchantLabel]'] : '')
-        ));
-
-        // field dependencies
-        $this->setChild('form_after', $this->getLayout()->createBlock('adminhtml/widget_form_element_dependence')
-            ->addFieldMap($merchantlabelField->getHtmlId(), $merchantlabelField->getName())
-            ->addFieldMap($paypalActiveField->getHtmlId(), $paypalActiveField->getName())
-            ->addFieldDependence(
-                $merchantlabelField->getName(),
-                $paypalActiveField->getName(),
-                1)
-        );
 
         return parent::_prepareForm();
     }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Social.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Social.php
new file mode 100755
index 0000000000..cf61736fc8
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Social.php
@@ -0,0 +1,296 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Tab for Social Networking settings
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Social
+    extends Mage_XmlConnect_Block_Adminhtml_Mobile_Widget_Form
+    implements Mage_Adminhtml_Block_Widget_Tab_Interface
+{
+    /**
+     * Prepare form before rendering HTML
+     * Setting Form Fieldsets and fields
+     *
+     * @return Mage_Adminhtml_Block_Widget_Form
+     */
+    protected function _prepareForm()
+    {
+        $form = new Varien_Data_Form();
+
+        $this->setForm($form);
+
+        $data = Mage::helper('xmlconnect')->getApplication()->getFormData();
+
+        $yesNoValues = Mage::getModel('adminhtml/system_config_source_yesno')->toOptionArray();
+
+        /**
+         * Default values for social networks is DISABLED
+         */
+        $twitterStatus = $facebookStatus = $linkedinStatus = 0;
+
+        /**
+         * Twitter fieldset options
+         */
+        $fieldsetTwitter = $form->addFieldset('twitter', array(
+            'legend' => $this->__('Twitter API')
+        ));
+
+        if (isset($data['conf[native][socialNetworking][twitter][isActive]'])) {
+            $twitterStatus = (int)$data['conf[native][socialNetworking][twitter][isActive]'];
+        }
+
+        $twitterActiveField = $fieldsetTwitter->addField(
+            'conf/native/socialNetworking/twitter/isActive',
+            'select',
+            array(
+                'label'     => $this->__('Enable Twitter'),
+                'name'      => 'conf[native][socialNetworking][twitter][isActive]',
+                'values'    => $yesNoValues,
+                'value'     => $twitterStatus,
+            )
+        );
+
+        if (isset($data['conf[native][socialNetworking][twitter][apiKey]'])) {
+            $twitterApiKey = $data['conf[native][socialNetworking][twitter][apiKey]'];
+        } else {
+            $twitterApiKey = '';
+        }
+
+        $twitterApiKeyField = $fieldsetTwitter->addField(
+            'conf/native/socialNetworking/twitter/apiKey',
+            'text',
+            array(
+                'label'     => $this->__('Twitter API Key'),
+                'name'      => 'conf[native][socialNetworking][twitter][apiKey]',
+                'required'  => true,
+                'value'     => $twitterApiKey
+            )
+        );
+
+        if (isset($data['conf[native][socialNetworking][twitter][secretKey]'])) {
+            $twitterSecretKey = $data['conf[native][socialNetworking][twitter][secretKey]'];
+        } else {
+            $twitterSecretKey = '';
+        }
+
+        $twitterSecretKeyField = $fieldsetTwitter->addField(
+            'conf/native/socialNetworking/twitter/secretKey',
+            'text',
+            array(
+                'label'     => $this->__('Twitter Secret Key'),
+                'name'      => 'conf[native][socialNetworking][twitter][secretKey]',
+                'required'  => true,
+                'value'     => $twitterSecretKey
+            )
+        );
+
+        /**
+         * Facebook fieldset options
+         */
+        $fieldsetFacebook = $form->addFieldset('facebook', array(
+            'legend' => $this->__('Facebook API'),
+        ));
+
+        if (isset($data['conf[native][socialNetworking][facebook][isActive]'])) {
+            $facebookStatus = (int)$data['conf[native][socialNetworking][facebook][isActive]'];
+        }
+
+        $facebookActiveField = $fieldsetFacebook->addField(
+            'conf/native/socialNetworking/facebook/isActive',
+            'select',
+            array(
+                'label'     => $this->__('Enable Facebook'),
+                'name'      => 'conf[native][socialNetworking][facebook][isActive]',
+                'values'    => $yesNoValues,
+                'value'     => $facebookStatus,
+            )
+        );
+
+        if (isset($data['conf[native][socialNetworking][facebook][appID]'])) {
+            $facebookAppID = $data['conf[native][socialNetworking][facebook][appID]'];
+        } else {
+            $facebookAppID = '';
+        }
+
+        $facebookAppIDField = $fieldsetFacebook->addField(
+            'conf/native/socialNetworking/facebook/appID',
+            'text',
+            array(
+                'label'     => $this->__('Facebook Application ID'),
+                'name'      => 'conf[native][socialNetworking][facebook][appID]',
+                'required'  => true,
+                'value'     => $facebookAppID
+            )
+        );
+
+        /**
+         * LinkedIn fieldset options
+         */
+        $fieldsetLinkedin = $form->addFieldset('linkedin', array(
+            'legend' => $this->__('LinkedIn API'),
+        ));
+
+        if (isset($data['conf[native][socialNetworking][linkedin][isActive]'])) {
+            $linkedinStatus = (int)$data['conf[native][socialNetworking][linkedin][isActive]'];
+        }
+
+        $linkedinActiveField = $fieldsetLinkedin->addField(
+            'conf/native/socialNetworking/linkedin/isActive',
+            'select',
+            array(
+                'label'     => $this->__('Enable LinkedIn'),
+                'name'      => 'conf[native][socialNetworking][linkedin][isActive]',
+                'values'    => $yesNoValues,
+                'value'     => $linkedinStatus,
+            )
+        );
+
+        if (isset($data['conf[native][socialNetworking][linkedin][apiKey]'])) {
+            $linkedinApiKey = $data['conf[native][socialNetworking][linkedin][apiKey]'];
+        } else {
+            $linkedinApiKey = '';
+        }
+
+        $linkedinApiKeyField = $fieldsetLinkedin->addField(
+            'conf/native/socialNetworking/linkedin/apiKey',
+            'text',
+            array(
+                'label'     => $this->__('LinkedIn API Key'),
+                'name'      => 'conf[native][socialNetworking][linkedin][apiKey]',
+                'required'  => true,
+                'value'     => $linkedinApiKey
+            )
+        );
+
+        if (isset($data['conf[native][socialNetworking][linkedin][secretKey]'])) {
+            $linkedinSecretKey = $data['conf[native][socialNetworking][linkedin][secretKey]'];
+        } else {
+            $linkedinSecretKey = '';
+        }
+
+        $linkedinSecretKeyField = $fieldsetLinkedin->addField(
+            'conf/native/socialNetworking/linkedin/secretKey',
+            'text',
+            array(
+                'label'     => $this->__('LinkedIn Secret Key'),
+                'name'      => 'conf[native][socialNetworking][linkedin][secretKey]',
+                'required'  => true,
+                'value'     => $linkedinSecretKey
+            )
+        );
+
+        /**
+         * Set field dependencies
+         */
+        $this->setChild('form_after', $this->getLayout()
+            ->createBlock('adminhtml/widget_form_element_dependence')
+            /**
+             * Facebook field dependencies
+             */
+            ->addFieldMap($facebookActiveField->getHtmlId(), $facebookActiveField->getName())
+            ->addFieldMap($facebookAppIDField->getHtmlId(), $facebookAppIDField->getName())
+            ->addFieldDependence(
+                $facebookAppIDField->getName(),
+                $facebookActiveField->getName(),
+            1)
+            /**
+             * Twitter field dependencies
+             */
+            ->addFieldMap($twitterApiKeyField->getHtmlId(), $twitterApiKeyField->getName())
+            ->addFieldMap($twitterActiveField->getHtmlId(), $twitterActiveField->getName())
+            ->addFieldMap($twitterSecretKeyField->getHtmlId(), $twitterSecretKeyField->getName())
+            ->addFieldDependence(
+                $twitterApiKeyField->getName(),
+                $twitterActiveField->getName(),
+            1)
+            ->addFieldDependence(
+                $twitterSecretKeyField->getName(),
+                $twitterActiveField->getName(),
+            1)
+            /**
+             * LinkedIn field dependencies
+             */
+            ->addFieldMap($linkedinApiKeyField->getHtmlId(), $linkedinApiKeyField->getName())
+            ->addFieldMap($linkedinActiveField->getHtmlId(), $linkedinActiveField->getName())
+            ->addFieldMap($linkedinSecretKeyField->getHtmlId(), $linkedinSecretKeyField->getName())
+            ->addFieldDependence(
+                $linkedinApiKeyField->getName(),
+                $linkedinActiveField->getName(),
+            1)
+            ->addFieldDependence(
+                $linkedinSecretKeyField->getName(),
+                $linkedinActiveField->getName(),
+            1)
+        );
+
+        return parent::_prepareForm();
+    }
+
+    /**
+     * Tab label getter
+     *
+     * @return string
+     */
+    public function getTabLabel()
+    {
+        return $this->__('Social Networking');
+    }
+
+    /**
+     * Tab title getter
+     *
+     * @return string
+     */
+    public function getTabTitle()
+    {
+        return $this->__('Social Networking');
+    }
+
+    /**
+     * Check if tab can be shown
+     *
+     * @return bool
+     */
+    public function canShowTab()
+    {
+        return (bool) !Mage::getSingleton('adminhtml/session')->getNewApplication();
+    }
+
+    /**
+     * Check if tab hidden
+     *
+     * @return bool
+     */
+    public function isHidden()
+    {
+        return false;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Submission/History.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Submission/History.php
index 7238c1b89f..929e5fa727 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Submission/History.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Submission/History.php
@@ -116,7 +116,8 @@ protected function _prepareColumns()
             'header'    => $this->__('Activation Key'),
             'align'     => 'left',
             'index'     => 'activation_key',
-            'type'      => 'text'
+            'type'      => 'text',
+            'escape'    => true
         ));
 
         $this->addColumn('created_at', array(
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Country.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Country.php
new file mode 100755
index 0000000000..3ecd26aac8
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Country.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect Country selector form element
+ *
+ * @category   Mage
+ * @package    Mage_XmlConnect
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Country extends Varien_Data_Form_Element_Checkboxes
+{
+    /**
+     * Flag of using the border in the table's TD
+     *
+     * @var bool
+     */
+    protected $_useBorderClass = false;
+
+    /**
+     * Init Element
+     *
+     * @param array $attributes
+     */
+    public function __construct($attributes=array())
+    {
+        parent::__construct($attributes);
+        $this->setType('checkbox');
+        $this->setExtType('country');
+    }
+
+    /**
+     * Retrieve HTML
+     *
+     * @return string
+     */
+    public function getElementHtml()
+    {
+        $values = $this->_prepareValues();
+
+        if (empty($values)) {
+            return '';
+        }
+
+        $columns = (int)$this->getData('columns');
+        $columns = $columns ? $columns : 1;
+        $rows = ceil(count($values) / $columns);
+        $row = $column = 0;
+
+        $options = array();
+
+        foreach ($values as $value) {
+            if (empty($value['value'])) {
+                continue;
+            }
+            $options[$row++][$column] = $value;
+            if ($row == $rows) {
+                $row = 0;
+                $column++;
+            }
+        }
+
+        while ($row < $rows) {
+            $options[$row++][$column] = '';
+        }
+
+        $id = $this->getData('id');
+        $id = empty($id) ? '' : ' id="' . $id . '-table"';
+        $class = $this->getData('class');
+        $html = "\n<table class=\"countries {$class}\"{$id}>\n";
+
+        $zebrine = '';
+        $stripy = false;
+        if (strpos($class, 'stripy')) {
+            $stripy = true;
+        }
+
+        $columns--;
+        foreach ($options as $row) {
+            $html .= "  <tr{$zebrine}>\n    ";
+
+            if ($stripy) {
+                $zebrine = empty($zebrine) ? ' class="odd"' : '';
+                $this->_useBorderClass = true;
+                foreach ($row as $idx => $option) {
+                    /**
+                     * for istore (as shown by $stripy) use border settings in TD
+                     */
+                    if ($idx == $columns) {
+                        /**
+                         * for last table's column TD should not have a border
+                         */
+                        $this->_useBorderClass = false;
+                    }
+                    $html .= $this->_optionToHtml($option);
+                }
+            } else {
+                foreach ($row as $option) {
+                    $html .= $this->_optionToHtml($option);
+                }
+            }
+
+            $html .= "\n  </tr>\n";
+        }
+
+        $html .= "</table>\n"
+            . $this->getAfterElementHtml();
+
+        return $html;
+    }
+
+    /**
+     * Get HTML code for the one option
+     *
+     * @param array $option
+     * @return string
+     */
+    protected function _optionToHtml($option)
+    {
+        if (empty($option)) {
+            $html = '<td>&nbsp;</td><td>&nbsp;</td>';
+        } else {
+            $id = $this->getHtmlId() . '_' . $this->_escape($option['value']);
+            $isNameLeft = $this->getData('place_name_left');
+
+            $border = $this->_useBorderClass ? ' class="border"' : '';
+            $html = '<td' . $border . '><input id="' . $id . '"';
+            foreach ($this->getHtmlAttributes() as $attribute) {
+                if ($value = $this->getDataUsingMethod($attribute, $option['value'])) {
+                    $html .= ' ' . $attribute . '="' . $value . '"';
+                }
+            }
+            $html .= ' value="' . $option['value'] . '" /></td>';
+
+            $label = '<td><label for="' . $id . '" style="white-space: nowrap;">' . $option['label'] . '</label></td>';
+
+            if ($isNameLeft) {
+                $html = $label . $html;
+            } else {
+                $html = $html . $label;
+            }
+        }
+
+        return $html;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Image.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Image.php
index 77cdff62ad..09a9a6855b 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Image.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Image.php
@@ -36,7 +36,8 @@ protected function _getUrl()
         $url = false;
         if ($this->getValue()) {
             if (strpos($this->getValue(), '://') === FALSE ) {
-                $url = Mage::getBaseUrl('media') . 'xmlconnect/' . Mage::helper('xmlconnect/image')->getFileDefaultSizeSuffixAsUrl($this->getValue());
+                $url = Mage::helper('xmlconnect/image')->getFileDefaultSizeSuffixAsUrl($this->getValue());
+                $url = Mage::helper('xmlconnect/image')->getMediaUrl($url);
             } else {
                 $url = $this->getValue();
             }
@@ -71,17 +72,20 @@ public function getElementHtml()
         $html = '<div style="white-space: nowrap">';
 
         $url = $this->_getUrl();
-        $html .= '<a href="'.$url.'" onclick="imagePreview(\''.$this->getHtmlId().'_image\'); return false;"><img src="'.$url.'" id="'.$this->getHtmlId().'_image" title="'.$this->getValue().'" alt="'.$this->getValue().'" height="22" width="22" class="small-image-preview v-middle" /></a> ';
+        $html .= '<a href="' . $url . '" onclick="imagePreview(\'' . $this->getHtmlId() . '_image\'); return false;">';
+        $html .= '<img src="' . $url . '" id="' . $this->getHtmlId() . '_image"';
+        $html .= ' alt="" height="22" width="22" class="small-image-preview v-middle" /></a> ';
 
-        $html .= '<input id="'.$this->getHtmlId().'_hidden" name="'.$this->getName()
-             .'" value="'.$this->getEscapedValue().'" type="hidden" />';
+        $html .= '<input id="' . $this->getHtmlId() . '_hidden" name="' . $this->getName();
+        $html .= '" value="' . $this->getEscapedValue() . '" type="hidden" />';
 
         $this->setClass('input-file');
-        $html .= '<input id="'.$this->getHtmlId().'" name="'.$this->getUploadName()
-             .'" value="'.$this->getEscapedValue().'" '.$this->serialize($this->getHtmlAttributes()).'/>'."\n";
-        $html.= $this->getAfterElementHtml();
+        $html .= '<input id="' . $this->getHtmlId() . '" name="' . $this->getUploadName();
+        $attr = $this->serialize($this->getHtmlAttributes());
+        $html .= '" value="' . $this->getEscapedValue() . '" ' . $attr . '/>' . "\n";
+        $html .= $this->getAfterElementHtml();
 
-        $html.= '</div>';
+        $html .= '</div>';
 
         return $html;
     }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Tabs.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Tabs.php
index 8266b6ea76..4cffd47ba4 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Tabs.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Tabs.php
@@ -39,7 +39,7 @@ public function getHtml()
 
         $blockClassName = Mage::getConfig()->getBlockClassName('adminhtml/template');
         $block = new $blockClassName;
-        $device = Mage::helper('xmlconnect')->getApplication()->getType();
+        $device = Mage::helper('xmlconnect')->getDeviceType();
         if (array_key_exists($device, Mage::helper('xmlconnect')->getSupportedDevices())) {
             $template = 'xmlconnect/form/element/app_tabs_' . strtolower($device) . '.phtml';
         } else {
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Content.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Content.php
index 42d717a88b..1f5403e9c5 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Content.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Content.php
@@ -25,20 +25,6 @@
  */
 class Mage_XmlConnect_Block_Adminhtml_Mobile_Preview_Content extends Mage_Adminhtml_Block_Template
 {
-    /**
-     * Configuration tab items array
-     *
-     * @var array
-     */
-    protected $tabItems = array();
-
-    /**
-     * Category item tint color styles
-     *
-     * @var string
-     */
-    protected $categoryItemTintColor = '';
-
     /**
      * Set path to template used for generating block's output.
      *
@@ -47,333 +33,8 @@ class Mage_XmlConnect_Block_Adminhtml_Mobile_Preview_Content extends Mage_Adminh
      */
     public function setTemplate($templateType)
     {
-        $deviceType = Mage::helper('xmlconnect')->getApplication()->getType();
-
-        if ($deviceType == Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE) {
-            parent::setTemplate('xmlconnect/edit/tab/design/preview/' . $templateType . '.phtml');
-        } else {
-            parent::setTemplate('xmlconnect/edit/tab/design/preview/' . $templateType . '_' . $deviceType . '.phtml');
-        }
+        $deviceType = Mage::helper('xmlconnect')->getDeviceType();
+        parent::setTemplate('xmlconnect/edit/tab/design/preview/' . $templateType . '_' . $deviceType . '.phtml');
         return $this;
     }
-
-    /**
-     * Prepare config data
-     * Implement set "conf" data as magic method
-     * Set config to 'tab_items' child block if exists
-     *
-     * @param array $conf
-     */
-    public function setConf($conf)
-    {
-        if (!is_array($conf)) {
-            $conf = array();
-        }
-        $tabs = isset($conf['tabBar']) && isset($conf['tabBar']['tabs']) ? $conf['tabBar']['tabs'] : false;
-        if ($tabs !== false) {
-            foreach ($tabs->getEnabledTabs() as $tab) {
-                $tab = (array) $tab;
-                $conf['tabBar'][$tab['action']]['label'] = $tab['label'];
-                $conf['tabBar'][$tab['action']]['image'] =
-                    Mage::helper('xmlconnect/image')->getSkinImagesUrl('mobile_preview/' . $tab['image']);
-            }
-        }
-        $tabItemsBlock = $this->getChild('tab_items');
-        if ($tabItemsBlock !== false) {
-            $tabItemsBlock->setData('conf', $conf);
-        }
-        $this->setData('conf', $conf);
-    }
-
-   /**
-    * Get preview images url
-    *
-    * @param string $name - file name
-    * @return string
-    */
-    public function getPreviewImagesUrl($name = '')
-    {
-        return  Mage::helper('xmlconnect/image')->getSkinImagesUrl('mobile_preview/' . $name);
-    }
-
-
-   /**
-    * Retrieve url for images in the skin folder
-    *
-    * @param string $name - path to file name relative to the skin dir
-    * @return string
-    */
-    public function getDesignPreviewImageUrl($name)
-    {
-        return Mage::helper('xmlconnect/image')->getSkinImagesUrl('design_default/' . $name);
-    }
-
-    /**
-     * Get application banner image url
-     *
-     * @throws Mage_Core_Exception
-     * @return string
-     */
-    public function getBannerImage()
-    {
-        $deviceType = Mage::helper('xmlconnect')->getApplication()->getType();
-        switch ($deviceType) {
-            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE:
-
-                if ($this->getData('conf/body/bannerImage')) {
-                    $bannerImage = $this->getData('conf/body/bannerImage');
-                } else {
-                    $bannerImage = $this->getDesignPreviewImageUrl(
-                        $this->getInterfaceImagesPaths('conf/body/bannerImage')
-                    );
-                }
-                break;
-
-            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPAD:
-
-                $configPath = 'conf/body/bannerIpadImage';
-                $imageUrlOrig = $this->getData($configPath);
-                if ($imageUrlOrig) {
-                    $width = Mage_XmlConnect_Helper_Ipad::PREVIEW_BANNER_WIDTH;
-                    $height = Mage_XmlConnect_Helper_Ipad::PREVIEW_BANNER_HEIGHT;
-                    $bannerImage = Mage::helper('xmlconnect/image')
-                        ->getCustomSizeImageUrl($imageUrlOrig, $width, $height);
-                } else {
-                    $bannerImage = $this->getPreviewImagesUrl('ipad/banner_image.png');
-                }
-                break;
-
-            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_ANDROID:
-
-                $configPath = 'conf/body/bannerAndroidImage';
-                if ($this->getData($configPath)) {
-                    $bannerImage = $this->getData($configPath);
-                } else {
-                    $bannerImage = $this->getDesignPreviewImageUrl(
-                        $this->getInterfaceImagesPaths($configPath)
-                    );
-                }
-                break;
-
-            default:
-                Mage::throwException($this->__('Device doesn\'t recognized: "%s". Unable to load a helper.', $deviceType));
-                break;
-        }
-        return $bannerImage;
-    }
-
-    /**
-     * Get background image url according device type
-     *
-     * @param string $orientation type of orientation
-     * @throws Mage_Core_Exception
-     * @return string
-     */
-    public function getBackgroundImage($orientation = '')
-    {
-        $backgroundImage = '';
-        $deviceType = Mage::helper('xmlconnect')->getApplication()->getType();
-        switch ($deviceType) {
-            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE:
-                $configPath = 'conf/body/backgroundImage';
-                $imageUrlOrig = $this->getData($configPath);
-                if ($imageUrlOrig) {
-                    $backgroundImage = $imageUrlOrig;
-                } else {
-                    $backgroundImage = $this->getDesignPreviewImageUrl(
-                        $this->getInterfaceImagesPaths($configPath)
-                    );
-                }
-                break;
-
-            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPAD:
-                switch ($orientation) {
-                    case Mage_XmlConnect_Helper_Ipad::ORIENTATION_LANDSCAPE:
-                        $configPath = 'conf/body/backgroundIpadLandscapeImage';
-                        $imageUrlOrig = $this->getData($configPath);
-                        if ($imageUrlOrig) {
-                            $width = Mage_XmlConnect_Helper_Ipad::PREVIEW_LANDSCAPE_BACKGROUND_WIDTH;
-                            $height = Mage_XmlConnect_Helper_Ipad::PREVIEW_LANDSCAPE_BACKGROUND_HEIGHT;
-                            $backgroundImage = Mage::helper('xmlconnect/image')
-                                ->getCustomSizeImageUrl($imageUrlOrig, $width, $height);
-                        } else {
-                            $backgroundImage =
-                                $this->getPreviewImagesUrl('ipad/background_home_landscape.jpg');
-                        }
-                    break;
-                    case Mage_XmlConnect_Helper_Ipad::ORIENTATION_PORTRAIT:
-                        $configPath = 'conf/body/backgroundIpadPortraitImage';
-                        $imageUrlOrig = $this->getData($configPath);
-                        if ($imageUrlOrig) {
-                            $width = Mage_XmlConnect_Helper_Ipad::PREVIEW_PORTRAIT_BACKGROUND_WIDTH;
-                            $height = Mage_XmlConnect_Helper_Ipad::PREVIEW_PORTRAIT_BACKGROUND_HEIGHT;
-                            $backgroundImage = Mage::helper('xmlconnect/image')
-                                ->getCustomSizeImageUrl($imageUrlOrig, $width, $height);
-                        } else {
-                            $backgroundImage =
-                                $this->getPreviewImagesUrl('ipad/background_portrait.jpg');
-                        }
-                    break;
-                    default:
-                        Mage::throwException(
-                            $this->__('Wrong Ipad background image orientation has been specified: "%s".', $param)
-                        );
-                }
-                break;
-
-            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_ANDROID:
-                switch ($orientation) {
-                    case Mage_XmlConnect_Helper_Android::ORIENTATION_LANDSCAPE:
-                        $configPath = 'conf/body/backgroundAndroidLandscapeImage';
-                        $imageUrlOrig = $this->getData($configPath);
-                        if ($imageUrlOrig) {
-                            $width = Mage_XmlConnect_Helper_Android::PREVIEW_LANDSCAPE_BACKGROUND_WIDTH;
-                            $height = Mage_XmlConnect_Helper_Android::PREVIEW_LANDSCAPE_BACKGROUND_HEIGHT;
-                            $backgroundImage = Mage::helper('xmlconnect/image')
-                                ->getCustomSizeImageUrl($imageUrlOrig, $width, $height);
-                        } else {
-                            $backgroundImage =
-                                $this->getPreviewImagesUrl('android/background_home_landscape.jpg');
-                        }
-                    break;
-                    case Mage_XmlConnect_Helper_Android::ORIENTATION_PORTRAIT:
-                        $configPath = 'conf/body/backgroundAndroidPortraitImage';
-                        $imageUrlOrig = $this->getData($configPath);
-                        if ($imageUrlOrig) {
-                            $width = Mage_XmlConnect_Helper_Android::PREVIEW_PORTRAIT_BACKGROUND_WIDTH;
-                            $height = Mage_XmlConnect_Helper_Android::PREVIEW_PORTRAIT_BACKGROUND_HEIGHT;
-                            $backgroundImage = Mage::helper('xmlconnect/image')
-                                ->getCustomSizeImageUrl($imageUrlOrig, $width, $height);
-                        } else {
-                            $backgroundImage =
-                                $this->getPreviewImagesUrl('android/background_portrait.jpg');
-                        }
-                    break;
-                    default:
-                        Mage::throwException(
-                            $this->__('Wrong Android background image orientation has been specified: "%s".', $orientation)
-                        );
-                }
-                break;
-
-            default:
-                Mage::throwException(
-                    $this->__('Device doesn\'t recognized: "%s". Unable to load a helper.', $deviceType)
-                );
-                break;
-        }
-        return $backgroundImage;
-
-    }
-
-    /**
-     * Get font info from config
-     *
-     * @param string $path
-     * @return string
-     */
-    public function getConfigFontInfo($path)
-    {
-        return $this->getData('conf/fonts/' . $path);
-    }
-
-    /**
-     * Get icon logo url
-     *
-     * @return string
-     */
-    public function getLogoUrl()
-    {
-        $configPath = 'conf/navigationBar/icon';
-        if ($this->getData($configPath)) {
-            return $this->getData($configPath);
-        } else {
-            return $this->getDesignPreviewImageUrl($this->getInterfaceImagesPaths($configPath));
-        }
-    }
-
-    /**
-     * Converts Data path(conf/submision/zzzz) to config path (conf/native/submission/zzzzz)
-     *
-     * @param string $configPath
-     * @return string
-     */
-    protected function _replaceConfig($configPath)
-    {
-        return $configPath = preg_replace('/^conf\/(.*)$/', 'conf/native/${1}', $configPath);
-    }
-
-    /**
-     * Expose function getInterfaceImagesPaths from xmlconnect/images
-     * Converts Data path(conf/submision/zzzz) to config path (conf/native/submission/zzzzz)
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getInterfaceImagesPaths($path)
-    {
-        $path = $this->_replaceConfig($path);
-        return Mage::helper('xmlconnect/image')->getInterfaceImagesPaths($path);
-    }
-
-   /**
-    * Get xmlconnect css url
-    *
-    * @param string $name - file name
-    * @return string
-    */
-    public function getPreviewCssUrl($name = '')
-    {
-        return  Mage::getDesign()->getSkinUrl('xmlconnect/' . $name);
-    }
-
-    /**
-     * Get category item tint color styles
-     *
-     * @return string
-     */
-    public function getCategoryItemTintColor()
-    {
-        if (!strlen($this->categoryItemTintColor)) {
-            $percent = .4;
-            $mask = 255;
-
-            $hex = str_replace('#','',$this->getData('conf/categoryItem/tintColor'));
-            $hex2 = '';
-            $_rgb = array();
-
-            $d = '[a-fA-F0-9]';
-
-            if (preg_match("/^($d$d)($d$d)($d$d)\$/", $hex, $rgb)) {
-                $_rgb = array(hexdec($rgb[1]), hexdec($rgb[2]), hexdec($rgb[3]));
-            }
-            if (preg_match("/^($d)($d)($d)$/", $hex, $rgb)) {
-                $_rgb = array(hexdec($rgb[1] . $rgb[1]), hexdec($rgb[2] . $rgb[2]), hexdec($rgb[3] . $rgb[3]));
-            }
-
-            for ($i=0; $i<3; $i++) {
-                $_rgb[$i] = round($_rgb[$i] * $percent) + round($mask * (1-$percent));
-                if ($_rgb[$i] > 255) {
-                    $_rgb[$i] = 255;
-                }
-            }
-
-            for($i=0; $i < 3; $i++) {
-                $hex_digit = dechex($_rgb[$i]);
-                if(strlen($hex_digit) == 1) {
-                    $hex_digit = "0" . $hex_digit;
-                }
-                $hex2 .= $hex_digit;
-            }
-            if($hex && $hex2){
-                // for IE
-                $this->categoryItemTintColor .= "filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#".$hex2."', endColorstr='#".$hex."');";
-                // for webkit browsers
-                $this->categoryItemTintColor .= "background:-webkit-gradient(linear, left top, left bottom, from(#".$hex2."), to(#".$hex."));";
-                // for firefox
-                $this->categoryItemTintColor .= "background:-moz-linear-gradient(top,  #".$hex2.",  #".$hex.");";
-            }
-        }
-        return $this->categoryItemTintColor;
-    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Tabitems.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Tabitems.php
index dec79a376c..83cddd688f 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Tabitems.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Tabitems.php
@@ -25,13 +25,6 @@
  */
 class Mage_XmlConnect_Block_Adminhtml_Mobile_Preview_Tabitems extends Mage_Adminhtml_Block_Template
 {
-    /**
-     * Current active tab according preview action
-     *
-     * @var bool|string
-     */
-    private $activeTab = false;
-
     /**
      * Set preview tab items template
      */
@@ -39,117 +32,9 @@ public function __construct()
     {
         parent::__construct();
 
-        $deviceType = Mage::helper('xmlconnect')->getApplication()->getType();
-
-        if ($deviceType == Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE) {
-            $this->setTemplate('xmlconnect/edit/tab/design/preview/tab_items.phtml');
-        } else {
-            $this->setTemplate('xmlconnect/edit/tab/design/preview/tab_items_' . $deviceType . '.phtml');
-        }
-    }
-
-    /**
-     * Collect tab items array
-     *
-     * @return array
-     */
-    public function getTabItems()
-    {
-        $items = array();
-        $model = Mage::helper('xmlconnect')->getApplication();
-        $tabs = $model->getEnabledTabsArray();
-        $tabLimit = (int) Mage::getStoreConfig('xmlconnect/devices/'.strtolower($model->getType()).'/tab_limit');
-        $showedTabs = 0;
-        foreach ($tabs as $tab) {
-            if (++$showedTabs > $tabLimit) {
-                break;
-            }
-            $items[$tab->action] = array(
-                'label' => Mage::helper('xmlconnect')->getTabLabel($tab->action),
-                'image' => $tab->image,
-                'action' => $tab->action,
-                'active' => strtolower($tab->action) == strtolower($this->activeTab),
-            );
-        }
-        return $items;
-    }
-
-    /**
-     * Check is exists a tab in a config array
-     *
-     * @param string $tabAction tab action name
-     * @return bool
-     */
-    public function isItemExists($tabAction)
-    {
-        $tabs = $this->getTabItems();
-        return (bool) isset($tabs[$tabAction]);
-    }
-
-   /**
-    * Get preview images url
-    *
-    * @todo this method is a duplicate of a parent block method and have to be removed
-    * @param string $name - file name
-    * @return string
-    */
-    public function getPreviewImagesUrl($name = '')
-    {
-        return  Mage::helper('xmlconnect/image')->getSkinImagesUrl('mobile_preview/' . $name);
-    }
-
-    /**
-     * Get icon logo url
-     *
-     * @todo this method is a duplicate of a parent block method and have to be removed
-     * @return string
-     */
-    public function getLogoUrl()
-    {
-        $configPath = 'conf/navigationBar/icon';
-        if ($this->getData($configPath)) {
-            return $this->getData($configPath);
-        } else {
-            return $this->getDesignPreviewImageUrl($this->getInterfaceImagesPaths($configPath));
-        }
-    }
-
-   /**
-    * Retrieve url for images in the skin folder
-    *
-    * @todo this method is a duplicate of a parent block method and have to be removed
-    * @param string $name - path to file name relative to the skin dir
-    * @return string
-    */
-    public function getDesignPreviewImageUrl($name)
-    {
-        return Mage::helper('xmlconnect/image')->getSkinImagesUrl('design_default/' . $name);
-    }
-
-    /**
-     * Expose function getInterfaceImagesPaths from xmlconnect/images
-     * Converts Data path(conf/submision/zzzz) to config path (conf/native/submission/zzzzz)
-     *
-     * @todo this method is a duplicate of a parent block method and have to be removed
-     * @param string $path
-     * @return array
-     */
-    public function getInterfaceImagesPaths($path)
-    {
-        $path = $this->_replaceConfig($path);
-        return Mage::helper('xmlconnect/image')->getInterfaceImagesPaths($path);
-    }
+        $deviceType = Mage::helper('xmlconnect')->getDeviceType();
 
-    /**
-     * Converts Data path(conf/submision/zzzz) to config path (conf/native/submission/zzzzz)
-     *
-     * @todo this method is a duplicate of a parent block method and have to be removed
-     * @param string $configPath
-     * @return string
-     */
-    protected function _replaceConfig($configPath)
-    {
-        return $configPath = preg_replace('/^conf\/(.*)$/', 'conf/native/${1}', $configPath);
+        $this->setTemplate('xmlconnect/edit/tab/design/preview/tab_items_' . $deviceType . '.phtml');
     }
 
     /**
@@ -160,7 +45,7 @@ protected function _replaceConfig($configPath)
      */
     public function setActiveTab($tab)
     {
-        $this->activeTab = $tab;
+        Mage::helper('xmlconnect')->getPreviewModel()->setActiveTab($tab);
         return $this;
     }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission.php
index f19842517b..0fbe192834 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission.php
@@ -60,9 +60,44 @@ public function __construct()
             array('application_id' => $app->getId())) . '\')');
     }
 
+    /**
+     * Adding styles to block
+     *
+     * @throws Mage_Core_Exception
+     * @return Mage_Adminhtml_Block_Widget_Form_Container
+     */
+    protected function _prepareLayout()
+    {
+        $this->getLayout()->getBlock('head')->addJs('jscolor/jscolor.js');
+        $this->getLayout()->getBlock('head')->addJs('scriptaculous/scriptaculous.js');
+
+
+        $deviceType = Mage::helper('xmlconnect')->getDeviceType();
+        switch ($deviceType) {
+            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE:
+                $this->getLayout()->getBlock('head')->addItem('skin_css', 'xmlconnect/mobile-home.css');
+                $this->getLayout()->getBlock('head')->addItem('skin_css', 'xmlconnect/mobile-catalog.css');
+                break;
+            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPAD:
+                $this->getLayout()->getBlock('head')->addItem('skin_css', 'xmlconnect/mobile-ipad-home.css');
+                $this->getLayout()->getBlock('head')->addItem('skin_css', 'xmlconnect/mobile-ipad-catalog.css');
+                break;
+            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_ANDROID:
+                $this->getLayout()->getBlock('head')->addItem('skin_css', 'xmlconnect/mobile-android.css');
+                break;
+            default:
+                Mage::throwException(
+                    $this->__('Device doesn\'t recognized: "%s". Unable to load preview model.', $deviceType)
+                );
+                break;
+        }
+
+        return parent::_prepareLayout();
+    }
+
     /**
      * Get form header title
-     * 
+     *
      * @return string
      */
     public function getHeaderText()
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Androidmarket.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Androidmarket.php
new file mode 100755
index 0000000000..6301bf5e35
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Androidmarket.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Country field renderer for Android Market
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Renderer_Country_Androidmarket
+    extends Mage_Adminhtml_Block_Widget_Form_Renderer_Fieldset_Element
+    implements Varien_Data_Form_Element_Renderer_Interface
+{
+    /**
+     * Override setting the template
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->setTemplate('xmlconnect/form/element/country/androidmarket.phtml');
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Istore.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Istore.php
new file mode 100644
index 0000000000..c076181dc6
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Istore.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Country field renderer for iStore
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Renderer_Country_Istore
+    extends Mage_Adminhtml_Block_Widget_Form_Renderer_Fieldset_Element
+    implements Varien_Data_Form_Element_Renderer_Interface
+{
+    /**
+     * Override setting the template
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->setTemplate('xmlconnect/form/element/country/istore.phtml');
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container/Submission.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container/Submission.php
index 661e252fd5..6f46cde568 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container/Submission.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container/Submission.php
@@ -24,6 +24,13 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+/**
+ * Device submission container block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
 class Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Tab_Container_Submission
     extends Mage_XmlConnect_Block_Adminhtml_Mobile_Widget_Form
     implements Mage_Adminhtml_Block_Widget_Tab_Interface
@@ -31,7 +38,7 @@ class Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Tab_Container_Submission
 
      /**
      * Constructor
-     * Setting view parameters 
+     * Setting view parameters
      */
     public function __construct()
     {
@@ -48,7 +55,7 @@ protected function _prepareLayout()
     {
         $block = $this->getLayout()->createBlock('adminhtml/template')
             ->setTemplate('xmlconnect/submission/app_icons_preview.phtml')
-            ->setImages($this->getApplication()->getImages());
+            ->setImages(Mage::helper('xmlconnect')->getApplication()->getImages());
         $this->setChild('images', $block);
         parent::_prepareLayout();
     }
@@ -61,7 +68,7 @@ protected function _prepareLayout()
      * @param string $title
      * @param string $note
      * @param string $default
-     * @param boolean $required 
+     * @param boolean $required
      */
     public function addImage($fieldset, $fieldName, $title, $note = '', $default = '', $required = false)
     {
@@ -80,12 +87,14 @@ public function addImage($fieldset, $fieldName, $title, $note = '', $default = '
      */
     protected function _prepareForm()
     {
+        $deviceType = Mage::helper('xmlconnect')->getDeviceType();
         $form = new Varien_Data_Form();
         $this->setForm($form);
-
+        /** @var $app Mage_XmlConnect_Model_Application */
+        $app = Mage::helper('xmlconnect')->getApplication();
         $form->setAction($this->getUrl('*/mobile/submission'));
-        $isResubmit = $this->getApplication()->getIsResubmitAction();
-        $formData = $this->getApplication()->getFormData();
+        $isResubmit = $app->getIsResubmitAction();
+        $formData = $app->getFormData();
 
         $url = Mage::getStoreConfig('xmlconnect/mobile_application/activation_key_url');
         $afterElementHtml = $this->__('In order to submit your app, you need to first purchase a <a href="%s" target="_blank">%s</a> from MagentoCommerce', $url, $this->__('Activation Key'));
@@ -108,12 +117,19 @@ protected function _prepareForm()
 
         if ($isResubmit) {
             $url = Mage::getStoreConfig('xmlconnect/mobile_application/resubmission_key_url');
-            $afterElementHtml = $this->__('In order to resubmit your app, you need to first purchase a <a href="%s" target="_blank">%s</a> from MagentoCommerce', $url, $this->__('Resubmission Key'));
+            $rsText = $this->__('Resubmission Key');
+            $afterElementHtml = $this->__('In order to resubmit your app, you need to first purchase a <a href="%s" target="_blank">%s</a> from MagentoCommerce', $url, $rsText);
+
+            if (isset($formData['conf[submit_text][resubmission_activation_key]'])) {
+                $rsKeyVal = $formData['conf[submit_text][resubmission_activation_key]'];
+            } else {
+                $rsKeyVal = null;
+            }
 
             $fieldset->addField('conf[submit_text][resubmission_activation_key]', 'text', array(
                 'name'     => 'conf[submit_text][resubmission_activation_key]',
                 'label'    => $this->__('Resubmission Key'),
-                'value'    => isset($formData['conf[submit_text][resubmission_activation_key]']) ? $formData['conf[submit_text][resubmission_activation_key]'] : null,
+                'value'    => $rsKeyVal,
                 'required' => true,
                 'after_element_html' => $afterElementHtml,
             ));
@@ -126,21 +142,47 @@ protected function _prepareForm()
             'value'     => '1',
         ));
 
+        switch ($deviceType) {
+            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE:
+                $titleLength = Mage_XmlConnect_Helper_Iphone::SUBMISSION_TITLE_LENGTH;
+                $descriptionLength = Mage_XmlConnect_Helper_Iphone::SUBMISSION_DESCRIPTION_LENGTH;
+                $descriptionNote = $this->__('Description that appears in the iTunes App Store. %s chars maximum. ', $descriptionLength);
+                break;
+            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPAD:
+                $titleLength = Mage_XmlConnect_Helper_Ipad::SUBMISSION_TITLE_LENGTH;
+                $descriptionLength = Mage_XmlConnect_Helper_Ipad::SUBMISSION_DESCRIPTION_LENGTH;
+                $descriptionNote = $this->__('Description that appears in the iTunes App Store. %s chars maximum. ', $descriptionLength);
+                break;
+            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_ANDROID:
+                $titleLength = Mage_XmlConnect_Helper_Android::SUBMISSION_TITLE_LENGTH;
+                $descriptionLength = Mage_XmlConnect_Helper_Android::SUBMISSION_DESCRIPTION_LENGTH;
+                $descriptionNote = $this->__('Description that appears in Android Market. %s chars maximum. ', $descriptionLength);
+                break;
+        }
+
+        $titleNote = $this->__('Name that appears beneath your app when users install it to their device. We recommend choosing a name that is 10-12 characters and that your customers will recognize. %s chars max.', $titleLength);
+
         $fieldset->addField('conf/submit_text/title', 'text', array(
             'name'      => 'conf[submit_text][title]',
             'label'     => $this->__('Title'),
-            'maxlength' => $formData['type'] == Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE ? '12' : '200',
+            'maxlength' => $titleLength,
             'value'     => isset($formData['conf[submit_text][title]']) ? $formData['conf[submit_text][title]'] : null,
-            'note'      => $this->__('Name that appears beneath your app when users install it to their device. We recommend choosing a name that is 10-12 characters and that your customers will recognize.'),
+            'note'      => $titleNote,
             'required'  => true,
         ));
 
+        if (isset($formData['conf[submit_text][description]'])) {
+            $descrVal = $formData['conf[submit_text][description]'];
+        } else {
+            $descrVal = null;
+        }
+
         $field = $fieldset->addField('conf/submit_text/description', 'textarea', array(
             'name'      => 'conf[submit_text][description]',
             'label'     => $this->__('Description'),
-            'maxlength' => '500',
-            'value'     => isset($formData['conf[submit_text][description]']) ? $formData['conf[submit_text][description]'] : null,
-            'note'      => $this->__('Description that appears in the iTunes App Store. 4000 chars maximum. '),
+            'maxlength' => $descriptionLength,
+            'value'     => $descrVal,
+            'note'      => $descriptionNote,
             'required'  => true,
         ));
         $field->setRows(15);
@@ -169,43 +211,114 @@ protected function _prepareForm()
             'value'     => '1',
         ));
 
-        $selected = isset($formData['conf[submit_text][country]']) ? explode(',', $formData['conf[submit_text][country]']) : null;
-        $fieldset->addField('conf/submit_text/country', 'multiselect', array(
-            'name'      => 'conf[submit_text][country][]',
-            'label'     => $this->__('Country'),
-            'values'    => Mage::helper('xmlconnect')->getCountryOptionsArray(),
-            'value'     => $selected,
-            'note'      => $this->__('Make this app available in the following territories'),
-            'required'  => true,
-        ));
+        if (isset($formData['conf[submit_text][country]'])) {
+            $selected = explode(',', $formData['conf[submit_text][country]']);
+        } else {
+            $selected = null;
+        }
+
+        $deviceHelper = Mage::helper('xmlconnect')->getDeviceHelper();
+        $fieldset->addType('country', 'Mage_XmlConnect_Block_Adminhtml_Mobile_Form_Element_Country');
+        $fieldset->addField('conf/submit_text/country', 'country', array(
+            'id'                => 'submission-countries',
+            'name'              => 'conf[submit_text][country][]',
+            'label'             => $deviceHelper->getCountryLabel(),
+            'values'            => Mage::helper('xmlconnect')->getCountryOptionsArray(),
+            'value'             => $selected,
+            'note'              => $this->__('Make this app available in the following territories'),
+            'columns'           => $deviceHelper->getCountryColumns(),
+            'place_name_left'   => $deviceHelper->isCountryNamePlaceLeft(),
+            'class'             => $deviceHelper->getCountryClass(),
+            'required'          => true,
+        ))
+        ->setRenderer($deviceHelper->getCountryRenderer());
+
+        if (isset($formData['conf[submit_text][copyright]'])) {
+            $copyVal = $formData['conf[submit_text][copyright]'];
+        } else {
+            $copyVal = null;
+        }
 
         $fieldset->addField('conf/submit_text/copyright', 'text', array(
             'name'      => 'conf[submit_text][copyright]',
             'label'     => $this->__('Copyright'),
             'maxlength' => '200',
-            'value'     => isset($formData['conf[submit_text][copyright]']) ? $formData['conf[submit_text][copyright]'] : null,
-            'note'      => $this->__('Appears in the info section of your app (example:  Copyright 2010 – Your Company, Inc.)'),
+            'value'     => $copyVal,
+            'note'      => $this->__('Appears in the info section of your app (example: Copyright 2010 – Your Company, Inc.)'),
             'required'  => true,
         ));
 
-        $fieldset->addField('conf/submit_text/keywords', 'text', array(
-            'name'      => 'conf[submit_text][keywords]',
-            'label'     => $this->__('Keywords'),
-            'maxlength' => '100',
-            'value'     => isset($formData['conf[submit_text][keywords]']) ? $formData['conf[submit_text][keywords]'] : null,
-            'note'      => $this->__('One or more keywords that describe your app. Keywords are matched to users` searches in the App Store and help return accurate search results. Separate multiple keywords with commas. 100 chars is maximum.'),
-        ));
+        if ($deviceType !== Mage_XmlConnect_Helper_Data::DEVICE_TYPE_ANDROID) {
+            if (isset($formData['conf[submit_text][keywords]'])) {
+                $keyWordsVal = $formData['conf[submit_text][keywords]'];
+            } else {
+                $keyWordsVal = null;
+            }
+
+            $fieldset->addField('conf/submit_text/keywords', 'text', array(
+                'name'      => 'conf[submit_text][keywords]',
+                'label'     => $this->__('Keywords'),
+                'maxlength' => '100',
+                'value'     => $keyWordsVal,
+                'note'      => $this->__('One or more keywords that describe your app. Keywords are matched to users\' searches in the App Store and help return accurate search results. Separate multiple keywords with commas. 100 chars is maximum.'),
+            ));
+        }
 
         $fieldset = $form->addFieldset('submit_icons', array('legend' => $this->__('Icons')));
-        $this->addImage($fieldset, 'conf/submit/icon', $this->__('Large iTunes Icon'),
-            $this->__('Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Required size: 512px x 512px.'), '', true);
-        $this->addImage($fieldset, 'conf/submit/loader_image', $this->__('Loader Splash Screen'),
-            $this->__('Image that appears on first screen while your app is loading. Required size: 320px x 460px.'), '', true);
-
-        $this->addImage($fieldset, 'conf/submit/logo', $this->__('Custom App Icon'),
-            $this->__('Icon that will appear on the user’s phone after they download your app.  You do not need to apply a gradient or soft edges (this is done automatically by Apple).  Recommended size: 57px x 57px at 72 dpi.'), '', true);
-        $this->addImage($fieldset, 'conf/submit/big_logo', $this->__('Copyright Page Logo'),
-            $this->__('Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px.'), '', true);
+
+        switch ($deviceType) {
+            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE:
+                $this->addImage($fieldset, 'conf/submit/icon', $this->__('Large iTunes Icon'),
+                    $this->__('Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Required size: 512px x 512px.'), '', true);
+
+                $this->addImage($fieldset, 'conf/submit/loader_image', $this->__('Loader Splash Screen'),
+                    $this->__('Image that appears on first screen while your app is loading. Required size: 320px x 460px.'), '', true);
+
+                $this->addImage($fieldset, 'conf/submit/loader_image_i4', $this->__('Loader Splash Screen <br />(iPhone 4 retina)'),
+                    $this->__('Image that appears on first screen while your app is loading. Required size: 640px x 920px.'), '', false);
+
+                $this->addImage($fieldset, 'conf/submit/logo', $this->__('Custom App Icon'),
+                    $this->__('Icon that will appear on the user’s phone after they download your app.  You do not need to apply a gradient or soft edges (this is done automatically by Apple).  Recommended size: 57px x 57px at 72 dpi.'), '', true);
+
+                $this->addImage($fieldset, 'conf/submit/logo_i4', $this->__('Custom App Icon <br />(iPhone 4 retina)'),
+                    $this->__('Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 114px x 114px.'), '', false);
+
+                $this->addImage($fieldset, 'conf/submit/big_logo', $this->__('Copyright Page Logo'),
+                    $this->__('Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px.'), '', true);
+
+                $this->addImage($fieldset, 'conf/submit/big_logo_i4', $this->__('Copyright Page Logo <br />(iPhone 4 retina)'),
+                    $this->__('Store logo that is displayed on copyright page of app. Preferred size: 200px x 200px.'), '', false);
+                break;
+            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPAD:
+                $this->addImage($fieldset, 'conf/submit/icon', $this->__('Large iTunes Icon'),
+                    $this->__('Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Required size: 512px x 512px.'), '', true);
+
+                $this->addImage($fieldset, 'conf/submit/ipad_loader_portrait_image', $this->__('Loader Splash Screen <br />(portrait mode)'),
+                    $this->__('Image that appears on first screen while your app is loading. Required size: 768px x 1024px.'), '', true);
+
+                $this->addImage($fieldset, 'conf/submit/ipad_loader_landscape_image', $this->__('Loader Splash Screen <br />(landscape mode)'),
+                    $this->__('Image that appears on first screen while your app is loading. Required size: 1024px x 768px.'), '', true);
+
+                $this->addImage($fieldset, 'conf/submit/ipad_logo', $this->__('Custom App Icon'),
+                    $this->__('Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 72px x 72px.'), '', true);
+
+                $this->addImage($fieldset, 'conf/submit/big_logo', $this->__('Copyright Page Logo'),
+                    $this->__('Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px.'), '', true);
+                break;
+            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_ANDROID:
+                $this->addImage($fieldset, 'conf/submit/icon', $this->__('High Resolution Application Icon'),
+                    $this->__('The icon that appears in the Android Market. Recommended size: 512px x 512px. Maximum size: 1024 KB.'), '', true);
+
+                $this->addImage($fieldset, 'conf/submit/android_loader_image', $this->__('Loader Splash Screen'),
+                    $this->__('Image that appears on first screen while your app is loading. Required size: 320px x 455px.'), '', true);
+
+                $this->addImage($fieldset, 'conf/submit/android_logo', $this->__('Custom App Icon'),
+                    $this->__('Icon that will appear on the user\'s device after they download your app. Recommended size: 48px x 48px.'), '', true);
+
+                $this->addImage($fieldset, 'conf/submit/big_logo', $this->__('Copyright Page Logo'),
+                    $this->__('Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px.'), '', true);
+                break;
+        }
 
         return parent::_prepareForm();
     }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Widget/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Widget/Form.php
index 865de50a6e..04af93a830 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Widget/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Widget/Form.php
@@ -101,14 +101,4 @@ protected function _getAdditionalElementTypes()
             'datetime' => $config->getBlockClassName('xmlconnect/adminhtml_mobile_form_element_datetime'),
         );
     }
-
-    /**
-     * Getter for current loaded application model
-     *
-     * @return Mage_XmlConnect_Model_Application
-     */
-    public function getApplication()
-    {
-        return Mage::helper('xmlconnect')->getApplication();
-    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit/Form.php
index ce3080bb1d..fef8fdb0bc 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit/Form.php
@@ -54,7 +54,12 @@ protected function _prepareForm()
 
         $action = $this->getUrl('*/*/saveTemplate');
 
-        $form = new Varien_Data_Form(array('id' => 'edit_form', 'action' => $action, 'method' => 'post', 'enctype' => 'multipart/form-data'));
+        $form = new Varien_Data_Form(array(
+            'id' => 'edit_form',
+            'action' => $action,
+            'method' => 'post',
+            'enctype' => 'multipart/form-data'
+        ));
         $form->setHtmlIdPrefix('template_');
 
         $fieldset = $form->addFieldset('edit_template', array('legend' => $this->__('Template')));
@@ -123,7 +128,6 @@ protected function _prepareForm()
             'style'     => 'height:30em;',
             'state'     => 'html',
             'required'  => true,
-//            'disabled'  => false,
             'disabled'  => !$this->_fieldsEnabled ? true : false,
             'config'    => $wysiwygConfig
         ));
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid.php
index 5b885ac17f..595e5eb268 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid.php
@@ -77,7 +77,8 @@ protected function _prepareColumns()
         $this->addColumn('name', array(
             'header'    => $this->__('Template Name'),
             'align'     => 'left',
-            'index'     => 'name'
+            'index'     => 'name',
+            'escape'    => true
         ));
 
         $this->addColumn('created_at', array(
@@ -101,20 +102,23 @@ protected function _prepareColumns()
             'align'     => 'left',
             'options'   => Mage::helper('xmlconnect')->getApplications(),
             'renderer'  => 'xmlconnect/adminhtml_template_grid_renderer_application',
+            'escape'    => true
         ));
 
         $this->addColumn('push_title', array(
             'header'    => $this->__('Push Title'),
             'type'      => 'text',
             'align'     => 'left',
-            'index'     => 'push_title'
+            'index'     => 'push_title',
+            'escape'    => true
         ));
 
         $this->addColumn('message_title', array(
             'header'    => $this->__('Message Title'),
             'type'      => 'text',
             'align'     => 'left',
-            'index'     => 'message_title'
+            'index'     => 'message_title',
+            'escape'    => true
         ));
 
         $this->addColumn('action', array(
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php
index 836f8a91f6..1519d97139 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php
@@ -40,17 +40,11 @@ class Mage_XmlConnect_Block_Cart_Paypal_Mep_Totals extends Mage_Checkout_Block_C
      */
     protected function _toHtml()
     {
-        $quote = $this->getQuote();
+        $paypalCart = Mage::getModel('paypal/cart', array($this->getQuote()));
         $totalsXmlObj  = new Mage_XmlConnect_Model_Simplexml_Element('<cart_totals></cart_totals>');
-        list($items, $totals) = Mage::helper('paypal')->prepareLineItems($quote);
-
-        if (Mage::helper('paypal')->areCartLineItemsValid($items, $totals, $quote->getBaseGrandTotal())) {
-            foreach ($totals as $code => $amount) {
-                $currencyAmount = $this->helper('core')->currency($amount, false, false);
-                $totalsXmlObj->addChild($code, Mage::helper('xmlconnect')->formatPriceForXml($currencyAmount));
-            }
-        } else {
-           Mage::throwException($this->__('Cart line items are not eligible for exporting to PayPal API'));
+        foreach ($paypalCart->getTotals(true) as $code => $amount) {
+            $currencyAmount = $this->helper('core')->currency($amount, false, false);
+            $totalsXmlObj->addChild($code, sprintf('%01.2F', $currencyAmount));
         }
         return $totalsXmlObj->asNiceXml();
     }
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Totals.php b/app/code/core/Mage/XmlConnect/Block/Cart/Totals.php
index 9fd03bafa3..641da00632 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Totals.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Totals.php
@@ -46,7 +46,7 @@ protected function _toHtml()
 
         foreach ($this->getQuote()->getTotals() as $total) {
             $code  = $total->getCode();
-            if ($code == 'giftcardaccount') {
+            if ($code == 'giftcardaccount' || $code == 'giftwrapping') {
                 continue;
             }
             $title = '';
@@ -56,7 +56,13 @@ protected function _toHtml()
                 case 'subtotal':
                     if ($renderer->displayBoth()) {
                         $title = $this->helper('xmlconnect')->__('Subtotal (Excl. Tax)');
-                        $this->_addTotalDataToXmlObj($totalsXmlObj, $code . '_excl_tax', $title, $total->getValueExclTax());
+                        $this->_addTotalDataToXmlObj(
+                            $totalsXmlObj,
+                            $code .
+                            '_excl_tax',
+                            $title,
+                            $total->getValueExclTax()
+                        );
 
                         $code  = $code . '_incl_tax';
                         $title = $this->helper('xmlconnect')->__('Subtotal (Incl. Tax)');
@@ -66,7 +72,13 @@ protected function _toHtml()
                 case 'shipping':
                     if ($renderer->displayBoth()) {
                         $title = $renderer->getExcludeTaxLabel();
-                        $this->_addTotalDataToXmlObj($totalsXmlObj, $code . '_excl_tax', $title, $renderer->getShippingExcludeTax());
+                        $this->_addTotalDataToXmlObj(
+                            $totalsXmlObj,
+                            $code .
+                            '_excl_tax',
+                            $title,
+                            $renderer->getShippingExcludeTax()
+                        );
 
                         $code  = $code . '_incl_tax';
                         $title = $renderer->getIncludeTaxLabel();
@@ -91,7 +103,7 @@ protected function _toHtml()
                 default:
                     break;
             }
-            if ($title == '') {
+            if (empty($title)) {
                 $title = $total->getTitle();
             }
             if (is_null($value)) {
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Category.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Category.php
index 91f1134ad4..20ebfdee30 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Category.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Category.php
@@ -70,6 +70,7 @@ protected function _toHtml()
             }
         }
 
+        /** @var $categoryCollection Mage_XmlConnect_Model_Mysql4_Category_Collection */
         $categoryCollection = Mage::getResourceModel('xmlconnect/category_collection');
         $categoryCollection->setStoreId(Mage::app()->getStore()->getId())
             ->setOrder('position', 'ASC')
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product.php
index 2e86b35688..65677597b5 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product.php
@@ -31,10 +31,8 @@
  * @package    Mage_XmlConnect
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-
 class Mage_XmlConnect_Block_Catalog_Product extends Mage_XmlConnect_Block_Catalog
 {
-
     /**
      * Retrieve product attributes as xml object
      *
@@ -51,7 +49,9 @@ public function productToXmlObject(Mage_Catalog_Model_Product $product, $itemNod
             $item->addChild('name', $item->xmlentities(strip_tags($product->getName())));
             $item->addChild('entity_type', $product->getTypeId());
             $item->addChild('short_description', $item->xmlentities(strip_tags($product->getShortDescription())));
-            $item->addChild('description', Mage::helper('xmlconnect')->htmlize($item->xmlentities($product->getDescription())));
+            $description = Mage::helper('xmlconnect')->htmlize($item->xmlentities($product->getDescription()));
+            $item->addChild('description', $description);
+            $item->addChild('link', $product->getProductUrl());
 
             if ($itemNodeName == 'item') {
                 $imageToResize = Mage::helper('xmlconnect/image')->getImageSizeForContent('product_small');
@@ -69,7 +69,7 @@ public function productToXmlObject(Mage_Catalog_Model_Product $product, $itemNod
             $file = Mage::helper('xmlconnect')->urlToPath($icon);
             $iconXml->addAttribute('modification_time', filemtime($file));
 
-            $item->addChild('in_stock', (int)$product->isSalable());
+            $item->addChild('in_stock', (int)$product->isInStock());
             $item->addChild('is_salable', (int)$product->isSalable());
             /**
              * By default all products has gallery (because of collection not load gallery attribute)
@@ -122,10 +122,13 @@ public function productToXmlObject(Mage_Catalog_Model_Product $product, $itemNod
     protected function _getMinimalQty($product)
     {
         if ($stockItem = $product->getStockItem()) {
-            return ($stockItem->getMinSaleQty() && $stockItem->getMinSaleQty() > 0 ? $stockItem->getMinSaleQty() * 1 : null);
+            if ($stockItem->getMinSaleQty() && $stockItem->getMinSaleQty() > 0) {
+                return ($stockItem->getMinSaleQty() * 1);
+            }
         }
         return null;
     }
+
     /**
      * Render product info xml
      *
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Gallery.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Gallery.php
index 070d976648..a94058635e 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Gallery.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Gallery.php
@@ -58,6 +58,8 @@ protected function _toHtml()
              * Big image
              */
             $bigImage = $helper->init($product, 'image', $item->getFile())
+                ->constrainOnly(true)
+                ->keepFrame(false)
                 ->resize(Mage::helper('xmlconnect/image')->getImageSizeForContent('product_gallery_big'));
 
             $fileNode = $imageNode->addChild('file');
@@ -73,6 +75,8 @@ protected function _toHtml()
              * Small image
              */
             $smallImage = $helper->init($product, 'thumbnail', $item->getFile())
+                ->constrainOnly(true)
+                ->keepFrame(false)
                 ->resize(Mage::helper('xmlconnect/image')->getImageSizeForContent('product_gallery_small'));
 
             $fileNode = $imageNode->addChild('file');
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options.php
index e71bf3e0f5..3b729c822a 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options.php
@@ -97,9 +97,9 @@ public function getProductCustomOptionsXmlObject(Mage_Catalog_Model_Product $pro
             /**
              * Process option price
              */
-            $price = Mage::helper('xmlconnect')->formatPriceForXml($option->getPrice());
-            if ($price > 0.00) {
-                $optionNode->addAttribute('price', $price);
+            $price = $option->getPrice();
+            if ($price) {
+                $optionNode->addAttribute('price', Mage::helper('xmlconnect')->formatPriceForXml($price));
                 $formatedPrice = Mage::app()->getStore($product->getStoreId())->formatPrice($price, false);
                 $optionNode->addAttribute('formated_price', $formatedPrice);
             }
@@ -111,7 +111,7 @@ public function getProductCustomOptionsXmlObject(Mage_Catalog_Model_Product $pro
                     $valueNode->addAttribute('label', $xmlModel->xmlentities(strip_tags($value->getTitle())));
 
                     $price = Mage::helper('xmlconnect')->formatPriceForXml($value->getPrice());
-                    if ($price > 0.00) {
+                    if ((float)$price != 0.00) {
                         $valueNode->addAttribute('price', $price);
                         $formatedPrice = $this->_formatPriceString($price, $product);
                         $valueNode->addAttribute('formated_price', $formatedPrice);
@@ -131,17 +131,21 @@ public function getProductCustomOptionsXmlObject(Mage_Catalog_Model_Product $pro
      */
     protected function _formatPriceString($price, $product)
     {
-        $priceTax = Mage::helper('tax')->getPrice($product, $price);
-        $priceIncTax = Mage::helper('tax')->getPrice($product, $price, true);
+        $priceTax       = Mage::helper('tax')->getPrice($product, $price);
+        $priceIncTax    = Mage::helper('tax')->getPrice($product, $price, true);
 
         if (Mage::helper('tax')->displayBothPrices() && $priceTax != $priceIncTax) {
-            $formated = Mage::helper('core')->currency($priceTax, true, false);
-            $formated .= ' (+'.Mage::helper('core')->currency($priceIncTax, true, false) . ' ' . Mage::helper('tax')->__('Incl. Tax').')';
+            $formatted = Mage::helper('core')->currency($priceTax, true, false)
+                . ' (+'
+                . Mage::helper('core')->currency($priceIncTax, true, false)
+                . ' '
+                . Mage::helper('tax')->__('Incl. Tax')
+                . ')';
         } else {
-            $formated = $this->helper('core')->currency($priceTax, true, false);
+            $formatted = $this->helper('core')->currency($priceTax, true, false);
         }
 
-        return $formated;
+        return $formatted;
     }
 
     /**
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Bundle.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Bundle.php
index 528d77de16..b828df216f 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Bundle.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Bundle.php
@@ -108,8 +108,10 @@ public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObj
 
                 $price = $product->getPriceModel()->getSelectionPreFinalPrice($product, $_selection);
                 $price = Mage::helper('xmlconnect')->formatPriceForXml($price);
-                if ($price > 0.00) {
-                    $valueNode->addAttribute('price', $price);
+                if ((float)$price != 0.00) {
+                    $valueNode->addAttribute('price', Mage::helper('xmlconnect')->formatPriceForXml(
+                        Mage::helper('core')->currency($price, false, false)
+                    ));
                     $valueNode->addAttribute('formated_price', $this->_formatPriceString($price, $product));
                 }
 
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Configurable.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Configurable.php
index e2c67b01c6..90ff61a0c0 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Configurable.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Configurable.php
@@ -102,13 +102,19 @@ public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObj
                     if (!isset($options[$attributeId][$value['value_index']])) {
                         continue;
                     }
-                    $price = Mage::helper('xmlconnect')->formatPriceForXml($this->_preparePrice($product, $value['pricing_value'], $value['is_percent']));
+                    $price = Mage::helper('xmlconnect')->formatPriceForXml(
+                        $this->_preparePrice($product, $value['pricing_value'], $value['is_percent'])
+                    );
+                    $optionProducts = array();
+                    if (isset($options[$attributeId][$value['value_index']])) {
+                        $optionProducts = $options[$attributeId][$value['value_index']];
+                    }
                     $info['options'][] = array(
-                        'id'    => $value['value_index'],
-                        'label' => $value['label'],
-                        'price' => $price,
-                        'formated_price' => $this->_formatPriceString($price, $product),
-                        'products'   => isset($options[$attributeId][$value['value_index']]) ? $options[$attributeId][$value['value_index']] : array(),
+                        'id'                => $value['value_index'],
+                        'label'             => $value['label'],
+                        'price'             => $price,
+                        'formated_price'    => $this->_formatPriceString($price, $product),
+                        'products'          => $optionProducts,
                     );
                 }
             }
@@ -133,7 +139,7 @@ public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObj
                     $valueNode = $optionNode->addChild('value');
                     $valueNode->addAttribute('code', $option['id']);
                     $valueNode->addAttribute('label', $optionsXmlObj->xmlentities(strip_tags($option['label'])));
-                    if ($option['price'] > 0.00) {
+                    if ((float)$option['price'] != 0.00) {
                         $valueNode->addAttribute('price', $option['price']);
                         $valueNode->addAttribute('formated_price', $option['formated_price']);
                     }
@@ -183,7 +189,7 @@ protected function _prepareRecursivelyRelatedValues(&$valueNode, $attributes, $p
             $_valueNode = $relatedNode->addChild('value');
             $_valueNode->addAttribute('code', $option['id']);
             $_valueNode->addAttribute('label', $_valueNode->xmlentities(strip_tags($option['label'])));
-            if ($option['price'] > 0.00) {
+            if ((float)$option['price'] != 0.00) {
                 $_valueNode->addAttribute('price', $option['price']);
                 $_valueNode->addAttribute('formated_price', $option['formated_price']);
             }
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Giftcard.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Giftcard.php
new file mode 100755
index 0000000000..6385ec9e8d
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Giftcard.php
@@ -0,0 +1,288 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Gift Card product options xml renderer
+ *
+ * @category   Mage
+ * @package    Mage_XmlConnect
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Catalog_Product_Options_Giftcard extends Mage_XmlConnect_Block_Catalog_Product_Options
+{
+    /**
+     * Get sender name
+     *
+     * @return string
+     */
+    public function getSenderName()
+    {
+        $senderName = $this->getDefaultValue('giftcard_sender_name');
+        if (!strlen($senderName)) {
+            $firstName = (string) Mage::getSingleton('customer/session')->getCustomer()->getFirstname();
+            $lastName  = (string) Mage::getSingleton('customer/session')->getCustomer()->getLastname();
+
+            if ($firstName && $lastName) {
+                $senderName = $firstName . ' ' . $lastName;
+            } else {
+                $senderName = '';
+            }
+        }
+        return $senderName;
+    }
+
+    /**
+     * Get sender email
+     *
+     * @return string
+     */
+    public function getSenderEmail()
+    {
+        $senderEmail = $this->getDefaultValue('giftcard_sender_email');
+
+        if (!strlen($senderEmail)) {
+            $senderEmail = (string) Mage::getSingleton('customer/session')->getCustomer()->getEmail();
+        }
+        return $senderEmail;
+    }
+
+    /**
+     * Get preconfigured values from product
+     *
+     * @param  $value param id
+     * @return string
+     */
+    protected function getDefaultValue($value)
+    {
+        if ($this->getProduct()) {
+            return (string) $this->getProduct()->getPreconfiguredValues()->getData($value);
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Check is message available for current product
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @return bool|int
+     */
+    public function isMessageAvailable(Mage_Catalog_Model_Product $product)
+    {
+        if ($product->getUseConfigAllowMessage()) {
+            return Mage::getStoreConfigFlag(Enterprise_GiftCard_Model_Giftcard::XML_PATH_ALLOW_MESSAGE);
+        } else {
+            return (int) $product->getAllowMessage();
+        }
+    }
+
+    /**
+     * Check is email available for product
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @return bool
+     */
+    public function isEmailAvailable(Mage_Catalog_Model_Product $product)
+    {
+        if ($product->getTypeInstance()->isTypePhysical()) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Is amount available for product
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @return bool
+     */
+    public function isAmountAvailable(Mage_Catalog_Model_Product $product)
+    {
+        if (!$product->getGiftcardAmounts()) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Generate gift card product options xml
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @param bool $isObject
+     * @return string | Mage_XmlConnect_Model_Simplexml_Element
+     */
+    public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObject = false)
+    {
+        /** set current product object */
+        $this->setProduct($product);
+
+        /** @var $xmlModel Mage_XmlConnect_Model_Simplexml_Element */
+        $xmlModel = $this->getProductCustomOptionsXmlObject($product);
+
+        /** @var $optionsXmlObj Mage_XmlConnect_Model_Simplexml_Element */
+        $optionsXmlObj = $xmlModel->options;
+
+        if (!$product->isSaleable()) {
+            return $isObject ? $xmlModel : $xmlModel->asNiceXml();
+        }
+
+        /** @var $test Enterprise_GiftCard_Model_Catalog_Product_Type_Giftcard */
+        $giftCard = $product->getTypeInstance(true);
+
+        /** @var $priceModel Enterprise_GiftCard_Block_Catalog_Product_Price */
+        $priceModel = $product->getPriceModel();
+
+        /** @var $coreHelper Mage_Core_Helper_Data */
+        $coreHelper = Mage::helper('core');
+
+        if ($this->isAmountAvailable($product)) {
+
+            $configValue = $this->getDefaultValue('giftcard_amount');
+
+            /**
+             * Render fixed amounts options
+             */
+            if (count($amounts = $priceModel->getSortedAmounts($product))) {
+                $amountNode = $optionsXmlObj->addChild('fixed_amounts');
+                foreach ($amounts as $priceId => $price) {
+                    $amount = $amountNode->addChild('amount');
+                    if ($configValue == $price) {
+                        $amount->addAttribute('selected', 1);
+                    }
+                    $amount->addAttribute(
+                        'price',
+                        $coreHelper->currency($price, true, false)
+                    );
+                }
+            }
+
+            /**
+             * Render open amount options
+             */
+            $openAmountNode = $optionsXmlObj->addChild('open_amount');
+            if ($product->getAllowOpenAmount()) {
+                $openAmountNode->addAttribute('enabled', 1);
+                if ($configValue == 'custom') {
+                    $openAmountNode->addAttribute(
+                        'selected_amount',
+                        $this->getDefaultValue('custom_giftcard_amount')
+                    );
+                }
+                if ($priceModel->getMinAmount($product)) {
+                    $minAmount = $xmlModel->xmlentities(
+                        $coreHelper->currency(
+                            $product->getOpenAmountMin(),
+                            true,
+                            false
+                        )
+                    );
+                } else {
+                    $minAmount = 0;
+                }
+                $openAmountNode->addAttribute('min_amount', $minAmount);
+
+                if ($priceModel->getMaxAmount($product)) {
+                    $maxAmount = $xmlModel->xmlentities(
+                        $coreHelper->currency(
+                            $product->getOpenAmountMax(),
+                            true,
+                            false
+                        )
+                    );
+                } else {
+                    $maxAmount = 0;
+                }
+                $openAmountNode->addAttribute('max_amount', $maxAmount);
+            } else {
+                $openAmountNode->addAttribute('enabled', 0);
+            }
+        }
+
+        /**
+         * Render Gift Card form options
+         */
+        $form = $optionsXmlObj->addCustomChild('form', null, array(
+                'name'      => 'giftcard-send-form',
+                'method'    => 'post'
+            )
+        );
+
+        $senderFieldset = $form->addCustomChild('fieldset', null, array(
+                'legend' => $this->__('Sender Information')
+            )
+        );
+
+        $senderFieldset->addField('giftcard_sender_name', 'text', array(
+                'label'     => Mage::helper('enterprise_giftcard')->__('Sender Name'),
+                'required'  => 'true',
+                'value'     => $this->getSenderName()
+            )
+        );
+
+        $recipientFieldset = $form->addCustomChild('fieldset', null, array(
+                'legend' => $this->__('Recipient Information')
+            )
+        );
+
+        $recipientFieldset->addField('giftcard_recipient_name', 'text', array(
+                'label'     => Mage::helper('enterprise_giftcard')->__('Recipient Name'),
+                'required'  => 'true',
+                'value'     => $this->getDefaultValue('giftcard_recipient_name')
+            )
+        );
+
+        if ($this->isEmailAvailable($product)) {
+            $senderFieldset->addField('giftcard_sender_email', 'text', array(
+                    'label'     => Mage::helper('enterprise_giftcard')->__('Sender Email'),
+                    'required'  => 'true',
+                    'value'     => $this->getSenderEmail()
+                )
+            );
+
+            $recipientFieldset->addField('giftcard_recipient_email', 'text', array(
+                    'label'     => Mage::helper('enterprise_giftcard')->__('Recipient Email'),
+                    'required'  => 'true',
+                    'value'     => $this->getDefaultValue('giftcard_recipient_email')
+                )
+            );
+        }
+
+        if ($this->isMessageAvailable($product)) {
+            $messageMaxLength = (int) Mage::getStoreConfig(
+                Enterprise_GiftCard_Model_Giftcard::XML_PATH_MESSAGE_MAX_LENGTH
+            );
+            $recipientFieldset->addField('giftcard_message', 'text', array(
+                    'label'     => Mage::helper('enterprise_giftcard')->__('Message'),
+                    'required'  => 'false',
+                    'max_length'=> $messageMaxLength,
+                    'value'     => $this->getDefaultValue('giftcard_message')
+                )
+            );
+        }
+
+        return $isObject ? $xmlModel : $xmlModel->asNiceXml();
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Grouped.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Grouped.php
index 8a85721d76..df38f2f757 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Grouped.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Grouped.php
@@ -82,8 +82,10 @@ public function getProductOptionsXml(Mage_Catalog_Model_Product $product, $isObj
                 $productPrice = $_item->getPrice();
             }
             $productPrice = Mage::helper('xmlconnect')->formatPriceForXml($productPrice);
-            if ($productPrice > 0.00) {
-                $optionNode->addAttribute('price', $productPrice);
+            if ($productPrice != 0.00) {
+                $optionNode->addAttribute('price', Mage::helper('xmlconnect')->formatPriceForXml(
+                    Mage::helper('core')->currency($productPrice, false, false)
+                ));
                 $optionNode->addAttribute('formated_price', $this->_formatPriceString($productPrice, $product));
             }
         }
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Giftcard.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Giftcard.php
new file mode 100755
index 0000000000..5d849d4cc8
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Giftcard.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Giftcard product price xml renderer
+ *
+ * @category   Mage
+ * @package    Mage_XmlConnect
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Catalog_Product_Price_Giftcard extends Mage_Bundle_Block_Catalog_Product_Price
+{
+    /**
+     * Return minimal amount for Giftcard product using price model
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @return float
+     */
+    public function getMinAmount($product = null)
+    {
+        if (is_null($product)) {
+            $product = $this->getProduct();
+        }
+        return $product->getPriceModel()->getMinAmount($product);
+    }
+
+    /**
+     * Return maximal amount for Giftcard product using price model
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @return float
+     */
+    public function getMaxAmount($product = null)
+    {
+        if (is_null($product)) {
+            $product = $this->getProduct();
+        }
+        return $product->getPriceModel()->getMaxAmount($product);
+    }
+
+    /**
+     * Collect product prices to specified item xml object
+     *
+     * @param Mage_Catalog_Model_Product $product
+     * @param Mage_XmlConnect_Model_Simplexml_Element $item
+     */
+    public function collectProductPrices(
+        Mage_Catalog_Model_Product $product,
+        Mage_XmlConnect_Model_Simplexml_Element $item
+    )
+    {
+        $this->setProduct($product);
+
+        if ($product->getCanShowPrice() !== false) {
+            $priceXmlObj = $item->addChild('price');
+
+            if (($_min = $this->getMinAmount()) && ($_max = $this->getMaxAmount()) && ($_min == $_max)) {
+                $priceXmlObj->addAttribute(
+                    'regular',
+                    Mage::helper('core')->currency($_min, true, false)
+                );
+            } elseif (($_min = $this->getMinAmount()) && $_min != 0) {
+                $priceXmlObj->addAttribute(
+                    'regular',
+                    Mage::helper('enterprise_giftcard')->__('From')
+                    . ': '
+                    . Mage::helper('core')->currency($_min, true, false)
+                );
+            }
+        }
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review.php
index f8493c9184..6ae58d495e 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review.php
@@ -52,13 +52,13 @@ public function reviewToXmlObject(Mage_Review_Model_Review $review, $itemNodeNam
         $item = new Mage_XmlConnect_Model_Simplexml_Element('<' . $itemNodeName . '></' . $itemNodeName . '>');
         if ($review->getId()) {
             $item->addChild('review_id', $review->getId());
-            $item->addChild('created_at', $review->getCreatedAt());
+            $item->addChild('created_at', $this->formatDate($review->getCreatedAt()));
             $item->addChild('title', $item->xmlentities(strip_tags($review->getTitle())));
             $item->addChild('nickname', $item->xmlentities(strip_tags($review->getNickname())));
             $detail = $item->xmlentities($review->getDetail());
             if ($itemNodeName == 'item') {
                 $remainder = '';
-                $deviceType = Mage::helper('xmlconnect')->getApplication()->getType();
+                $deviceType = Mage::helper('xmlconnect')->getDeviceType();
                 if ($deviceType != Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPAD) {
                     $detail = Mage::helper('core/string')
                         ->truncate($detail, self::REVIEW_DETAIL_TRUNCATE_LEN, '', $remainder, false);
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review/List.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review/List.php
index dc185c2869..e4f5059c6d 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review/List.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review/List.php
@@ -77,6 +77,7 @@ protected function _getReviewCollection()
             if (!$product) {
                 return null;
             }
+            /** @var $collection Mage_Review_Model_Mysql4_Review_Collection */
             $collection = Mage::getResourceModel('review/review_collection')
                 ->addEntityFilter('product', $product->getId())
                 ->addStoreFilter(Mage::app()->getStore()->getId())
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Form.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Form.php
index 8546a3a658..a2b7c5f61f 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Form.php
@@ -40,107 +40,152 @@ class Mage_XmlConnect_Block_Checkout_Address_Form extends Mage_Core_Block_Templa
      */
     protected function _toHtml()
     {
+        /** @var $xmlModel Mage_XmlConnect_Model_Simplexml_Element */
+        $xmlModel = Mage::getModel('xmlconnect/simplexml_element', '<form></form>');
+        $xmlModel->addAttribute('name', 'address_form');
+        $xmlModel->addAttribute('method', 'post');
 
-        $address  = $this->getAddress();
-        $xmlModel = new Mage_XmlConnect_Model_Simplexml_Element('<node></node>');
-        $customer = Mage::getSingleton('customer/session')->getCustomer();
-        $addressType = $this->getType() == 'shipping' || $this->getType() == 'billing' ? $this->getType() : 'billing';
-        $isAllowedGuestCheckout= Mage::getSingleton('checkout/session')->getQuote()->isAllowedGuestCheckout();
-        if ($addressType == 'shipping') {
-            $addressId = $customer->getDefaultShipping();
-            $address   = $customer->getAddressById($addressId);
+        if ($this->getType() == 'shipping' || $this->getType() == 'billing') {
+            $addressType = $this->getType();
         } else {
-            $addressId = $customer->getDefaultBilling();
-            $address   = $customer->getAddressById($addressId);
+            $addressType = 'billing';
         }
 
-        if ($addressId && $address && $address->getId()) {
+        $isAllowedGuestCheckout = Mage::getSingleton('checkout/session')
+            ->getQuote()
+            ->isAllowedGuestCheckout();
 
-            $firstname  = $xmlModel->xmlentities(strip_tags($address->getFirstname()));
-            $lastname   = $xmlModel->xmlentities(strip_tags($address->getLastname()));
-            $company    = $xmlModel->xmlentities(strip_tags($address->getCompany()));
-            if ($isAllowedGuestCheckout) {
-                $email  = $xmlModel->xmlentities(strip_tags($address->getEmail()));
-            }
-            $street1    = $xmlModel->xmlentities(strip_tags($address->getStreet(1)));
-            $street2    = $xmlModel->xmlentities(strip_tags($address->getStreet(2)));
-            $city       = $xmlModel->xmlentities(strip_tags($address->getCity()));
-            $regionId   = $xmlModel->xmlentities($address->getRegionId());
-            $region = Mage::getModel('directory/region')->load($regionId)->getName();
-            if (!$region) {
-                $region = $address->getRegion();
-            }
-            $region     = $xmlModel->xmlentities(strip_tags($region));
-            $postcode   = $xmlModel->xmlentities(strip_tags($address->getPostcode()));
-            $countryId  = $xmlModel->xmlentities($address->getCountryId());
-            $telephone  = $xmlModel->xmlentities(strip_tags($address->getTelephone()));
-            $fax        = $xmlModel->xmlentities(strip_tags($address->getFax()));
-        } else {
-            $firstname = $lastname = $company = $email = $street1 = $street2 = '';
-            $city = $region = $postcode = $telephone = $fax = '';
-            $countryId = $regionId = null;
+        $countries = $this->_getCountryOptions();
+
+        $xmlModel->addField($addressType.'[firstname]', 'text', array(
+                'label'     => $this->__('First Name'),
+                'required'  => 'true',
+                'value'     => ''
+            )
+        );
+
+        $xmlModel->addField($addressType.'[lastname]', 'text', array(
+                'label'     => $this->__('Last Name'),
+                'required'  => 'true',
+                'value'     => ''
+            )
+        );
+
+        $xmlModel->addField($addressType.'[company]', 'text', array(
+                'label'     => $this->__('Company'),
+                'required'  => 'true',
+                'value'     => ''
+            )
+        );
+
+        if ($isAllowedGuestCheckout
+            && !Mage::getSingleton('customer/session')->isLoggedIn()
+            && $addressType == 'billing'
+        ) {
+            $emailField = $xmlModel->addField($addressType.'[email]', 'text', array(
+                    'label'     => $this->__('Email Address'),
+                    'required'  => 'true',
+                    'value'     => ''
+                )
+            );
+            $emailValidator = $emailField->addChild('validators')->addChild('validator');
+            $emailValidator->addAttribute('type', 'email');
+            $emailValidator->addAttribute('message', $this->__('Wrong email format'));
         }
 
-        $countries = $this->_getCountryOptions();
+        $xmlModel->addField($addressType.'[street][]', 'text', array(
+                'label'     => $this->__('Address'),
+                'required'  => 'true',
+                'value'     => ''
+            )
+        );
 
-        $regions = array();
-        $countryOptionsXml = '<values>';
-        if (is_array($countries)) {
-            foreach ($countries as $key => $data) {
-                if ($data['value']) {
-                    $regions = $this->_getRegionOptions($data['value']);
-                }
-                $countryOptionsXml .= '
-                <item relation="' . (is_array($regions) && !empty($regions) ? 'region_id' : 'region') . '"' . ($countryId == $data['value'] ? ' selected="1"' : '') . '>
-                    <label>' . $xmlModel->xmlentities((string)$data['label']) . '</label>
-                    <value>' . $xmlModel->xmlentities($data['value']) . '</value>';
-                if (is_array($regions) && !empty($regions)) {
-                    $countryOptionsXml .= '<regions>';
-                    foreach ($regions as $_key => $_data) {
-                        $countryOptionsXml .= '<region_item' . ($regionId == $_data['value'] ? ' selected="1"' : '') . '>';
-                        $countryOptionsXml .=
-                            '<label>' . $xmlModel->xmlentities((string)$_data['label']) . '</label>
-                             <value>' . $xmlModel->xmlentities($_data['value']) . '</value>';
-                        $countryOptionsXml .= '</region_item>';
-                    }
-                    $countryOptionsXml .= '</regions>';
+        $xmlModel->addField($addressType.'[street][]', 'text', array(
+                 'label'     => $this->__('Address 2'),
+                 'value'     => ''
+            )
+        );
+
+        $xmlModel->addField($addressType.'[city]', 'text', array(
+                'label'     => $this->__('City'),
+                'required'  => 'true',
+                'value'     => ''
+            )
+        );
+
+        $countryOptionsXml = $xmlModel->addField($addressType.'[country_id]', 'select', array(
+                'label'     => $this->__('Country'),
+                'required'  => 'true',
+                'value'     => ''
+            )
+        )
+        ->addChild('values');
+
+        foreach ($countries as $data) {
+            $regions = array();
+
+            if ($data['value']) {
+                $regions = $this->_getRegionOptions($data['value']);
+            }
+
+            $regionStr = (!empty($regions) ? 'region_id' : 'region');
+
+            $countryXml = $countryOptionsXml->addCustomChild('item', null, array(
+                    'relation' => $regionStr
+                )
+            );
+            $countryXml->addCustomChild('label', (string)$data['label']);
+            $countryXml->addCustomChild('value', (string)$data['value']);
+            if (!empty($regions)) {
+                $regionXml = $countryXml->addChild('regions');
+
+                foreach ($regions as $_data) {
+                    $regionItemXml = $regionXml->addChild('region_item');
+                    $regionItemXml->addCustomChild('label', (string)$_data['label']);
+                    $regionItemXml->addCustomChild('value', (string)$_data['value']);
                 }
-                $countryOptionsXml .= '</item>';
             }
         }
-        $countryOptionsXml .= '</values>';
-
-        $xml = <<<EOT
-<form name="address_form" method="post">
-        <field name="{$addressType}[firstname]" type="text" label="{$xmlModel->xmlentities($this->__('First Name'))}" required="true" value="$firstname" />
-        <field name="{$addressType}[lastname]" type="text" label="{$xmlModel->xmlentities($this->__('Last Name'))}" required="true" value="$lastname" />
-        <field name="{$addressType}[company]" type="text" label="{$xmlModel->xmlentities($this->__('Company'))}" value="$company" />
-EOT;
-        if ($isAllowedGuestCheckout && !Mage::getSingleton('customer/session')->isLoggedIn() && $addressType == 'billing') {
-            $xml .= <<<EOT
-        <field name="{$addressType}[email]" type="text" label="{$xmlModel->xmlentities($this->__('Email Address'))}" value="$email" required="true" >
-            <validators>
-                <validator type="email" message="{$xmlModel->xmlentities($this->__('Wrong email format'))}"/>
-            </validators>
-        </field>
-EOT;
-        }
-        $xml .= <<<EOT
-        <field name="{$addressType}[street][]" type="text" label="{$xmlModel->xmlentities($this->__('Address'))}" required="true" value="$street1" />
-        <field name="{$addressType}[street][]" type="text" label="{$xmlModel->xmlentities($this->__('Address 2'))}" value="$street2" />
-        <field name="{$addressType}[city]" type="text" label="{$xmlModel->xmlentities($this->__('City'))}" required="true" value="$city" />
-        <field name="{$addressType}[country_id]" type="select" label="{$xmlModel->xmlentities($this->__('Country'))}" required="true">
-            $countryOptionsXml
-        </field>
-        <field name="{$addressType}[region]" type="text" label="{$xmlModel->xmlentities($this->__('State/Province'))}" value="$region" />
-        <field name="{$addressType}[region_id]" type="select" label="{$xmlModel->xmlentities($this->__('State/Province'))}" required="true" />
-        <field name="{$addressType}[postcode]" type="text" label="{$xmlModel->xmlentities($this->__('Zip/Postal Code'))}" required="true" value="$postcode" />
-        <field name="{$addressType}[telephone]" type="text" label="{$xmlModel->xmlentities($this->__('Telephone'))}" required="true" value="$telephone" />
-        <field name="{$addressType}[fax]" type="text" label="{$xmlModel->xmlentities($this->__('Fax'))}" value="$fax" />
-        <field name="{$addressType}[save_in_address_book]" type="checkbox" label="{$xmlModel->xmlentities($this->__('Save in address book'))}"/>
-</form>
-EOT;
-        return $xml;
+
+        $xmlModel->addField($addressType.'[region]', 'text', array(
+                'label' => $this->__('State/Province'),
+                'value' => ''
+            )
+        );
+
+        $xmlModel->addField($addressType.'[region_id]', 'select', array(
+                'label'     => $this->__('State/Province'),
+                'required'  => 'true',
+                'value'     => ''
+            )
+        );
+
+        $xmlModel->addField($addressType.'[postcode]', 'text', array(
+                'label'     => $this->__('Zip/Postal Code'),
+                'required'  => 'true',
+                'value'     => ''
+            )
+        );
+
+        $xmlModel->addField($addressType.'[telephone]', 'text', array(
+                'label'     => $this->__('Telephone'),
+                'required'  => 'true',
+                'value'     => ''
+            )
+        );
+
+        $xmlModel->addField($addressType.'[fax]', 'text', array(
+                'label' => $this->__('Fax'),
+                'value' => ''
+            )
+        );
+
+        $xmlModel->addField($addressType.'[save_in_address_book]', 'checkbox', array(
+                'label' => $this->__('Save in address book'),
+            )
+        );
+
+        return $xmlModel->asNiceXml();
     }
 
     /**
@@ -177,9 +222,10 @@ protected function _getCountryOptions()
         if (Mage::app()->useCache('config') && $cache = Mage::app()->loadCache($cacheKey)) {
             $options = unserialize($cache);
         } else {
+            /** @var $collection Mage_Directory_Model_Mysql4_Country_Collection */
             $collection = Mage::getModel('directory/country')->getResourceCollection()
                 ->loadByStore();
-            $options = $collection->toOptionArray();
+            $options = $collection->toOptionArray(false);
             if (Mage::app()->useCache('config')) {
                 Mage::app()->saveCache(serialize($options), $cacheKey, array('config'));
             }
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Agreements.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Agreements.php
index 7cb361f96c..56392fc4d6 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Agreements.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Agreements.php
@@ -28,7 +28,6 @@
  * One page checkout agreements xml renderer
  *
  * @category   Mage
- * @category   Mage
  * @package    Mage_XmlConnect
  * @author     Magento Core Team <core@magentocommerce.com>
  */
@@ -49,7 +48,8 @@ protected function _toHtml()
                 if (!$agreement->getIsHtml()) {
                     $content = nl2br(strip_tags($content));
                 }
-                $itemXmlObj->addChild('label', $agreementsXmlObj->xmlentities(strip_tags($agreement->getCheckboxText())));
+                $agreementText = $agreementsXmlObj->xmlentities(strip_tags($agreement->getCheckboxText()));
+                $itemXmlObj->addChild('label', $agreementText);
                 $itemXmlObj->addChild('content', $content);
                 $itemXmlObj->addChild('code', 'agreement[' . $agreement->getId() . ']');
                 $itemXmlObj->addChild('agreement_id', $agreement->getId());
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review/Info.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review/Info.php
index e63056a0ee..241c26fb06 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review/Info.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review/Info.php
@@ -58,7 +58,9 @@ protected function _toHtml()
             $itemXml->addChild('item_id', $item->getId());
             $itemXml->addChild('name', $itemsXmlObj->xmlentities(strip_tags($renderer->getProductName())));
             $itemXml->addChild('qty', $renderer->getQty());
-            $icon = $renderer->getProductThumbnail()->resize(Mage::helper('xmlconnect/image')->getImageSizeForContent('product_small'));
+            $icon = $renderer->getProductThumbnail()->resize(
+                Mage::helper('xmlconnect/image')->getImageSizeForContent('product_small')
+            );
 
             $iconXml = $itemXml->addChild('icon', $icon);
 
@@ -70,8 +72,11 @@ protected function _toHtml()
              */
             $exclPrice = $inclPrice = 0.00;
             if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) {
-                if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales') && $item->getWeeeTaxAppliedAmount()) {
-                    $exclPrice = $item->getCalculationPrice() + $item->getWeeeTaxAppliedAmount() + $item->getWeeeTaxDisposition();
+                $typeOfDisplay = Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales');
+                if ($typeOfDisplay && $item->getWeeeTaxAppliedAmount()) {
+                    $exclPrice = $item->getCalculationPrice()
+                        + $item->getWeeeTaxAppliedAmount()
+                        + $item->getWeeeTaxDisposition();
                 } else {
                     $exclPrice = $item->getCalculationPrice();
                 }
@@ -79,7 +84,8 @@ protected function _toHtml()
 
             if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) {
                 $_incl = $this->helper('checkout')->getPriceInclTax($item);
-                if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales') && $item->getWeeeTaxAppliedAmount()) {
+                $typeOfDisplay = Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales');
+                if ($typeOfDisplay && $item->getWeeeTaxAppliedAmount()) {
                     $inclPrice = $_incl + $item->getWeeeTaxAppliedAmount();
                 } else {
                     $inclPrice = $_incl - $item->getWeeeTaxDisposition();
@@ -118,15 +124,20 @@ protected function _toHtml()
              */
             $exclPrice = $inclPrice = 0.00;
             if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) {
-                if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales') && $item->getWeeeTaxAppliedAmount()) {
-                    $exclPrice = $item->getRowTotal() + $item->getWeeeTaxAppliedRowAmount() + $item->getWeeeTaxRowDisposition();
+                $typeOfDisplay = Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales');
+                if ($typeOfDisplay && $item->getWeeeTaxAppliedAmount()) {
+                    $exclPrice = $item->getRowTotal()
+                        + $item->getWeeeTaxAppliedRowAmount()
+                        + $item->getWeeeTaxRowDisposition();
                 } else {
                     $exclPrice = $item->getRowTotal();
                 }
             }
             if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) {
                 $_incl = $this->helper('checkout')->getSubtotalInclTax($item);
-                if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales') && $item->getWeeeTaxAppliedAmount()) {
+                if (Mage::helper('weee')->typeOfDisplay($item, array(0, 1, 4), 'sales')
+                    && $item->getWeeeTaxAppliedAmount()
+                ) {
                     $inclPrice = $_incl + $item->getWeeeTaxAppliedRowAmount();
                 } else {
                     $inclPrice = $_incl - $item->getWeeeTaxRowDisposition();
@@ -167,8 +178,10 @@ protected function _toHtml()
                 foreach ($_options as $_option) {
                     $_formatedOptionValue = $renderer->getFormatedOptionValue($_option);
                     $optionXml = $itemOptionsXml->addChild('option');
-                    $optionXml->addAttribute('label', $itemsXmlObj->xmlentities(strip_tags($_option['label'])));
-                    $optionXml->addAttribute('text', $itemsXmlObj->xmlentities(strip_tags($_formatedOptionValue['value'])));
+                    $labelValue = $itemsXmlObj->xmlentities(strip_tags($_option['label']));
+                    $optionXml->addAttribute('label', $labelValue);
+                    $textValue = $itemsXmlObj->xmlentities(strip_tags($_formatedOptionValue['value']));
+                    $optionXml->addAttribute('text', $textValue);
 //                    if (isset($_formatedOptionValue['full_view'])) {
 //                        $label = strip_tags($_option['label']);
 //                        $value = strip_tags($_formatedOptionValue['full_view']);
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Authorizenet.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Authorizenet.php
index 34a940e55f..195b34bf3c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Authorizenet.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Authorizenet.php
@@ -28,7 +28,6 @@
  * Credit Card (Authorize.net) Payment method xml renderer
  *
  * @category   Mage
- * @category   Mage
  * @package    Mage_XmlConnect
  * @author     Magento Core Team <core@magentocommerce.com>
  */
@@ -85,32 +84,34 @@ public function addPaymentFormToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $
 
         $verification = '';
         if ($this->hasVerification()) {
+            $cvnText = $this->__('Card Verification Number');
+            $cvnValidationText = $this->__('Card verification number is wrong');
             $verification =
-            '<field name="payment[cc_cid]" type="text" label="' . $this->helper('xmlconnect')->__('Card Verification Number') . '" required="true">
-                <validators>
-                    <validator relation="payment[cc_type]" type="credit_card_svn" message="' . $this->helper('xmlconnect')->__('Card verification number is wrong') . '"/>
-                </validators>
+            '<field name="payment[cc_cid]" type="text" label="' . $cvnText . '" required="true">
+            <validators>
+                <validator relation="payment[cc_type]" type="credit_card_svn" message="' . $cvnValidationText . '"/>
+            </validators>
             </field>';
         }
 
         $xml = <<<EOT
     <fieldset>
-        <field name="payment[cc_type]" type="select" label="{$this->helper('xmlconnect')->__('Credit Card Type')}" required="true">
+        <field name="payment[cc_type]" type="select" label="{$this->__('Credit Card Type')}" required="true">
             <values>
                 $ccTypes
             </values>
         </field>
-        <field name="payment[cc_number]" type="text" label="{$this->helper('xmlconnect')->__('Credit Card Number')}" required="true">
+        <field name="payment[cc_number]" type="text" label="{$this->__('Credit Card Number')}" required="true">
             <validators>
-                <validator relation="payment[cc_type]" type="credit_card" message="{$this->helper('xmlconnect')->__('Credit card number does not match credit card type.')}"/>
+                <validator relation="payment[cc_type]" type="credit_card" message="{$this->__('Credit card number does not match credit card type.')}"/>
             </validators>
         </field>
-        <field name="payment[cc_exp_month]" type="select" label="{$this->helper('xmlconnect')->__('Expiration Date - Month')}" required="true">
+        <field name="payment[cc_exp_month]" type="select" label="{$this->__('Expiration Date - Month')}" required="true">
             <values>
                 $ccMonths
             </values>
         </field>
-        <field name="payment[cc_exp_year]" type="select" label="{$this->helper('xmlconnect')->__('Expiration Date - Year')}" required="true">
+        <field name="payment[cc_exp_year]" type="select" label="{$this->__('Expiration Date - Year')}" required="true">
             <values>
                 $ccYears
             </values>
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Ccsave.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Ccsave.php
index 6d724a6e10..4c362ce376 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Ccsave.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Ccsave.php
@@ -28,7 +28,6 @@
  * CC Save Payment method xml renderer
  *
  * @category   Mage
- * @category   Mage
  * @package    Mage_XmlConnect
  * @author     Magento Core Team <core@magentocommerce.com>
  */
@@ -89,42 +88,48 @@ public function addPaymentFormToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $
         $verification = '';
         if ($this->hasVerification()) {
             $verification =
-            '<field name="payment[cc_cid]" type="text" label="' . $this->helper('xmlconnect')->__('Card Verification Number') . '" required="true">
+            '<field name="payment[cc_cid]" type="text" label="'
+                . $this->__('Card Verification Number') . '" required="true">
                 <validators>
-                    <validator relation="payment[cc_type]" type="credit_card_svn" message="' . $this->helper('xmlconnect')->__('Card verification number is wrong') . '"/>
+                    <validator relation="payment[cc_type]" type="credit_card_svn" message="'
+                . $this->__('Card verification number is wrong') . '"/>
                 </validators>
             </field>';
         }
 
         $solo = '';
         if ($this->hasSsCardType()) {
-            $ssCcMonths = $helper->getArrayAsXmlItemValues($_ccMonthArray, $this->getInfoData('cc_ss_start_month'));
-            $ssCcYears = $helper->getArrayAsXmlItemValues($this->getSsStartYears(), $this->getInfoData('cc_ss_start_year'));
+            $ssCcMonths = $helper->getArrayAsXmlItemValues(
+                $_ccMonthArray, $this->getInfoData('cc_ss_start_month')
+            );
+            $ssCcYears = $helper->getArrayAsXmlItemValues(
+                $this->getSsStartYears(), $this->getInfoData('cc_ss_start_year')
+            );
             $solo = $helper->getSoloXml($ssCcMonths, $ssCcYears);
         }
 
         $xml = <<<EOT
     <fieldset>
-        <field name="payment[cc_owner]" type="text" label="{$this->helper('xmlconnect')->__('Name on Card')}" value="$owner" required="true" />
-        <field name="payment[cc_type]" type="select" label="{$this->helper('xmlconnect')->__('Credit Card Type')}" required="true">
+        <field name="payment[cc_owner]" type="text" label="{$this->__('Name on Card')}" value="$owner" required="true" />
+        <field name="payment[cc_type]" type="select" label="{$this->__('Credit Card Type')}" required="true">
             <values>
-                $ccTypes
+                {$ccTypes}
             </values>
-            $solo
+            {$solo}
         </field>
-        <field name="payment[cc_number]" type="text" label="{$this->helper('xmlconnect')->__('Credit Card Number')}" required="true">
+        <field name="payment[cc_number]" type="text" label="{$this->__('Credit Card Number')}" required="true">
             <validators>
-                <validator relation="payment[cc_type]" type="credit_card" message="{$this->helper('xmlconnect')->__('Credit card number does not match credit card type.')}"/>
+                <validator relation="payment[cc_type]" type="credit_card" message="{$this->__('Credit card number does not match credit card type.')}"/>
             </validators>
         </field>
-        <field name="payment[cc_exp_month]" type="select" label="{$this->helper('xmlconnect')->__('Expiration Date - Month')}" required="true">
+        <field name="payment[cc_exp_month]" type="select" label="{$this->__('Expiration Date - Month')}" required="true">
             <values>
-                $ccMonths
+                {$ccMonths}
             </values>
         </field>
-        <field name="payment[cc_exp_year]" type="select" label="{$this->helper('xmlconnect')->__('Expiration Date - Year')}" required="true">
+        <field name="payment[cc_exp_year]" type="select" label="{$this->__('Expiration Date - Year')}" required="true">
             <values>
-                $ccYears
+                {$ccYears}
             </values>
         </field>
         $verification
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Checkmo.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Checkmo.php
index afafe52751..6e8c906e97 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Checkmo.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Checkmo.php
@@ -28,7 +28,6 @@
  * Check / Money order Payment method xml renderer
  *
  * @category   Mage
- * @category   Mage
  * @package    Mage_XmlConnect
  * @author     Magento Core Team <core@magentocommerce.com>
  */
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php
index 85ef7418e8..5267ca982d 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php
@@ -28,7 +28,6 @@
  * One page checkout payment methods xml renderer
  *
  * @category   Mage
- * @category   Mage
  * @package    Mage_XmlConnect
  * @author     Magento Core Team <core@magentocommerce.com>
  */
@@ -65,33 +64,74 @@ protected function _toHtml()
     {
         $methodsXmlObj = new Mage_XmlConnect_Model_Simplexml_Element('<payment_methods></payment_methods>');
 
-        $methodBlocks         = $this->getChild();
-        $methodArray = array (
-            'payment_ccsave' => 'Mage_Payment_Model_Method_Cc',
-            'payment_checkmo' => 'Mage_Payment_Model_Method_Checkmo',
-            'payment_purchaseorder' => 'Mage_Payment_Model_Method_Purchaseorder');
-        $usedMethods          = $sortedAvailableMethodCodes = $usedCodes = array();
+        /**
+         * Pre-defined array of methods that we are going to render
+         */
+        $methodArray = array(
+            'payment_ccsave'            => 'Mage_Payment_Model_Method_Cc',
+            'payment_checkmo'           => 'Mage_Payment_Model_Method_Checkmo',
+            'payment_purchaseorder'     => 'Mage_Payment_Model_Method_Purchaseorder',
+        );
+
+        /**
+         * Check is available Payment Bridge and add methods for rendering
+         */
+        if (is_object(Mage::getConfig()->getNode('modules/Enterprise_Pbridge'))) {
+            $pbridgeMethodArray = array(
+                'pbridge_authorizenet'  => 'Enterprise_Pbridge_Model_Payment_Method_Authorizenet',
+                'pbridge_paypal'        => 'Enterprise_Pbridge_Model_Payment_Method_Paypal',
+                'pbridge_verisign'      => 'Enterprise_Pbridge_Model_Payment_Method_Payflow_Pro',
+                'pbridge_paypaluk'      => 'Enterprise_Pbridge_Model_Payment_Method_Paypaluk',
+            );
+
+            $pbBlockRenderer = 'xmlconnect/checkout_payment_method_';
+            $pbBlockName = 'xmlconnect.checkout.payment.method.';
+
+            foreach ($pbridgeMethodArray as $block => $class) {
+                $currentBlockRenderer = $pbBlockRenderer . $block;
+                $currentBlockName = $pbBlockName . $block;
+                $this->getLayout()->addBlock($currentBlockRenderer, $currentBlockName);
+                $this->setChild($block, $currentBlockName);
+            }
+            $methodArray = $methodArray + $pbridgeMethodArray;
+        }
+
+        $usedMethods = $sortedAvailableMethodCodes = $usedCodes = array();
+
+        /**
+         * Receive available methods for checkout
+         */
         $allAvailableMethods  = Mage::helper('payment')->getStoreMethods(Mage::app()->getStore(), $this->getQuote());
 
+        /**
+         * Get sorted codes of available methods
+         */
         foreach ($allAvailableMethods as $method) {
             $sortedAvailableMethodCodes[] = $method->getCode();
         }
 
+        /**
+         * Get blocks for layout to check available renderers
+         */
+        $methodBlocks = $this->getChild();
+
         /**
          * Collect directly supported by xmlconnect methods
          */
-        foreach ($methodBlocks as $block) {
-            if (!$block) {
-                continue;
-            }
+        if (!empty($methodBlocks) && is_array($methodBlocks)) {
+            foreach ($methodBlocks as $block) {
+                if (!$block) {
+                    continue;
+                }
 
-            $method = $block->getMethod();
-            if (!$this->_canUseMethod($method) || in_array($method->getCode(), $usedCodes)) {
-                continue;
+                $method = $block->getMethod();
+                if (!$this->_canUseMethod($method) || in_array($method->getCode(), $usedCodes)) {
+                    continue;
+                }
+                $this->_assignMethod($method);
+                $usedCodes[] = $method->getCode();
+                $usedMethods[$method->getCode()] = array('renderer' => $block, 'method' => $method);
             }
-            $this->_assignMethod($method);
-            $usedCodes[] = $method->getCode();
-            $usedMethods[$method->getCode()] = array('renderer' => $block, 'method' => $method);
         }
 
         /**
@@ -99,7 +139,7 @@ protected function _toHtml()
          */
         foreach ($methodArray as $methodName => $methodModelClassName) {
             $methodRenderer = $this->getChild($methodName);
-            if (!is_null($methodRenderer)) {
+            if (!empty($methodRenderer)) {
                 foreach ($sortedAvailableMethodCodes as $methodCode) {
                     /**
                      * Skip used methods
@@ -133,7 +173,6 @@ protected function _toHtml()
             if (!in_array($code, $usedCodes)) {
                 continue;
             }
-
             $method   = $usedMethods[$code]['method'];
             $renderer = $usedMethods[$code]['renderer'];
             /**
@@ -155,7 +194,6 @@ protected function _toHtml()
         if (!count($usedMethods)) {
             Mage::throwException($this->__('Sorry, no payment options are available for this order at this time.'));
         }
-
         return $methodsXmlObj->asNiceXml();
     }
 
@@ -167,7 +205,10 @@ protected function _toHtml()
      */
     protected function _canUseMethod($method)
     {
-        if (!$method || !$method->canUseCheckout() || !$method->canUseForMultishipping() || !$method->isAvailable($this->getQuote())) {
+        if (!($method instanceof Mage_Payment_Model_Method_Abstract)
+            || !$method->canUseCheckout()
+            || !$method->isAvailable($this->getQuote())
+        ) {
             return false;
         }
         return parent::_canUseMethod($method);
@@ -189,7 +230,7 @@ protected function _addToXml($block, $methodsXmlObj, $usedCodes)
 
     /**
      * Deprecated function check method status
-     * 
+     *
      * @deprecated after 1.4.2.0
      * @param Mage_Payment_Model_Method_Abstract $method
      * @return bool
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Direct.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Direct.php
index e1ba260749..55be52c13c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Direct.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Direct.php
@@ -28,11 +28,11 @@
  * PayPal Direct Payment method xml renderer
  *
  * @category   Mage
- * @category   Mage
  * @package    Mage_XmlConnect
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-class Mage_XmlConnect_Block_Checkout_Payment_Method_Paypal_Direct extends Mage_XmlConnect_Block_Checkout_Payment_Method_Paypal_Payflow
+class Mage_XmlConnect_Block_Checkout_Payment_Method_Paypal_Direct
+    extends Mage_XmlConnect_Block_Checkout_Payment_Method_Paypal_Payflow
 {
     /**
      * Prevent any rendering
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Payflow.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Payflow.php
index 2c1f1ffa11..6153b4e65b 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Payflow.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Payflow.php
@@ -28,7 +28,6 @@
  * Credit Card (Payflow Pro) Payment method xml renderer
  *
  * @category   Mage
- * @category   Mage
  * @package    Mage_XmlConnect
  * @author     Magento Core Team <core@magentocommerce.com>
  */
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Abstract.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Abstract.php
new file mode 100755
index 0000000000..f317d1f842
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Abstract.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Abstract Pbridge Payment method xml renderer
+ *
+ * @category   Mage
+ * @package    Mage_XmlConnect
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+abstract class Mage_XmlConnect_Block_Checkout_Payment_Method_Pbridge_Abstract
+    extends Enterprise_Pbridge_Block_Payment_Form_Abstract
+{
+    /**
+     * Retrieve payment method model
+     *
+     * @return Mage_Payment_Model_Method_Abstract
+     */
+    public function getMethod()
+    {
+        $method = $this->getData('method');
+        if (!$method) {
+            $method = Mage::getModel('enterprise_pbridge/payment_method_' . $this->_model);
+            $this->setData('method', $method);
+        }
+        return $method;
+    }
+
+    /**
+     * Return redirect url for Payment Bridge application
+     *
+     * @return string
+     */
+    public function getRedirectUrl()
+    {
+        return $this->getUrl('xmlconnect/pbridge/result', array('_current' => true, '_secure' => true));
+    }
+
+    /**
+     * Add payment method through Pbridge iframe XML object
+     *
+     * @param Mage_XmlConnect_Model_Simplexml_Element $paymentItemXmlObj
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    public function addPaymentFormToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $paymentItemXmlObj)
+    {
+        $paymentItemXmlObj->addAttribute('is_pbridge', 1);
+        $paymentItemXmlObj->addChild('pb_iframe', $paymentItemXmlObj->xmlentities($this->createIframe()));
+        return $paymentItemXmlObj;
+    }
+
+    protected function createIframe()
+    {
+        $code = $this->getMethodCode();
+        $body = <<<EOT
+<div id="payment_form_{$code}">
+    {$this->getIframeBlock()->toHtml()}
+</div>
+EOT;
+        return $this->helper('xmlconnect')->htmlize($body);
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Authorizenet.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Authorizenet.php
new file mode 100755
index 0000000000..5acf61c0b5
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Authorizenet.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Authorize.Net through Pbridge Payment method xml renderer
+ *
+ * @category   Mage
+ * @package    Mage_XmlConnect
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Checkout_Payment_Method_Pbridge_Authorizenet
+    extends Mage_XmlConnect_Block_Checkout_Payment_Method_Pbridge_Abstract
+{
+    /**
+     * Payment model path
+     *
+     * @var string
+     */
+    protected $_model = 'authorizenet';
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypal.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypal.php
new file mode 100755
index 0000000000..543891dfee
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypal.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * PayPal Direct through Pbridge Payment method xml renderer
+ *
+ * @category   Mage
+ * @package    Mage_XmlConnect
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Checkout_Payment_Method_Pbridge_Paypal
+    extends Mage_XmlConnect_Block_Checkout_Payment_Method_Pbridge_Abstract
+{
+    /**
+     * Payment model path
+     *
+     * @var string
+     */
+    protected $_model = 'paypal';
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypaluk.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypaluk.php
new file mode 100755
index 0000000000..357c873f82
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypaluk.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * PayPalUK Direct through Pbridge Payment method xml renderer
+ *
+ * @category   Mage
+ * @package    Mage_XmlConnect
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Checkout_Payment_Method_Pbridge_Paypaluk
+    extends Mage_XmlConnect_Block_Checkout_Payment_Method_Pbridge_Abstract
+{
+    /**
+     * Payment model path
+     *
+     * @var string
+     */
+    protected $_model = 'paypaluk';
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Verisign.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Verisign.php
new file mode 100755
index 0000000000..8da1fd514b
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Verisign.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Payflow Pro through Pbridge Payment method xml renderer
+ *
+ * @category   Mage
+ * @package    Mage_XmlConnect
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Checkout_Payment_Method_Pbridge_Verisign
+    extends Mage_XmlConnect_Block_Checkout_Payment_Method_Pbridge_Abstract
+{
+    /**
+     * Payment model path
+     *
+     * @var string
+     */
+    protected $_model = 'payflow_pro';
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Purchaseorder.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Purchaseorder.php
index ce1546bb2b..72766bc572 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Purchaseorder.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Purchaseorder.php
@@ -28,7 +28,6 @@
  * Check / Money order Payment method xml renderer
  *
  * @category   Mage
- * @category   Mage
  * @package    Mage_XmlConnect
  * @author     Magento Core Team <core@magentocommerce.com>
  */
@@ -77,14 +76,15 @@ public function addPaymentFormToXmlObj(Mage_XmlConnect_Model_Simplexml_Element $
         $formXmlObj->addAttribute('method', 'post');
 
         $poNumber = $this->getInfoData('po_number');
+        $poNumberText = $this->__('Purchase Order Number');
         $xml = <<<EOT
-    <fieldset>
-        <field name="payment[po_number]" type="text" label="{$this->helper('xmlconnect')->__('Purchase Order Number')}" value="$poNumber" required="true" />
-    </fieldset>
+<fieldset>
+    <field name="payment[po_number]" type="text" label="{$poNumberText}" value="$poNumber" required="true" />
+</fieldset>
 EOT;
         $fieldsetXmlObj = new Mage_XmlConnect_Model_Simplexml_Element($xml);
         $formXmlObj->appendChild($fieldsetXmlObj);
-     
+
         return $paymentItemXmlObj;
     }
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Pbridge/Result.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Pbridge/Result.php
new file mode 100755
index 0000000000..109cf9eef8
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Pbridge/Result.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Pbridge result payment block
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Checkout_Pbridge_Result extends Mage_Core_Block_Template
+{
+    /**
+     * Return url for redirect with params of Payment Bridge incoming data
+     *
+     * @return string
+     */
+    public function getPbridgeParamsAsUrl()
+    {
+        $pbParams = Mage::helper('enterprise_pbridge')->getPbridgeParams();
+        $params = array_merge(
+            array('_nosid' => true, 'method' => 'pbridge_' . $pbParams['original_payment_method']),
+            $pbParams
+        );
+        return Mage::getUrl('xmlconnect/pbridge/output', $params);
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Configuration.php b/app/code/core/Mage/XmlConnect/Block/Configuration.php
index cd210eba82..0013f8ab07 100644
--- a/app/code/core/Mage/XmlConnect/Block/Configuration.php
+++ b/app/code/core/Mage/XmlConnect/Block/Configuration.php
@@ -34,6 +34,11 @@
 
 class Mage_XmlConnect_Block_Configuration extends Mage_Core_Block_Template
 {
+    /**
+     * Current application model
+     *
+     * @var Mage_XmlConnect_Model_Application
+     */
     protected $_app;
 
     /**
@@ -62,6 +67,8 @@ protected function _beforeToHtml()
      */
     protected function _buildRecursive($section, $subtree)
     {
+        Mage::helper('xmlconnect')->getDeviceHelper()->checkRequiredConfigFields($subtree);
+
         foreach ($subtree as $key => $value) {
             if (is_array($value)) {
                 if ($key == 'fonts') {
diff --git a/app/code/core/Mage/XmlConnect/Block/Home.php b/app/code/core/Mage/XmlConnect/Block/Home.php
index dfa4180be2..fca2f219ff 100644
--- a/app/code/core/Mage/XmlConnect/Block/Home.php
+++ b/app/code/core/Mage/XmlConnect/Block/Home.php
@@ -31,7 +31,6 @@
  * @package    Mage_XmlConnect
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-
 class Mage_XmlConnect_Block_Home extends Mage_XmlConnect_Block_Catalog
 {
 
@@ -47,8 +46,10 @@ class Mage_XmlConnect_Block_Home extends Mage_XmlConnect_Block_Catalog
      */
     protected function _toHtml()
     {
-        $homeXmlObj = new Mage_XmlConnect_Model_Simplexml_Element('<home></home>');
+        /** @var $xmlModel Mage_XmlConnect_Model_Simplexml_Element */
+        $homeXmlObj = Mage::getModel('xmlconnect/simplexml_element', '<home></home>');
 
+        /** @var $categoryCollection Mage_XmlConnect_Model_Mysql4_Category_Collection */
         $categoryCollection = Mage::getResourceModel('xmlconnect/category_collection');
         $categoryCollection->setStoreId(Mage::app()->getStore()->getId())
             ->addParentIdFilter(Mage::app()->getStore()->getRootCategoryId())
@@ -79,5 +80,4 @@ protected function _toHtml()
 
         return $homeXmlObj->asNiceXml();
     }
-
 }
diff --git a/app/code/core/Mage/XmlConnect/Block/Review/Form.php b/app/code/core/Mage/XmlConnect/Block/Review/Form.php
new file mode 100644
index 0000000000..326ec30172
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Block/Review/Form.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Product review form xml renderer
+ *
+ * @category   Mage
+ * @package    Mage_XmlConnect
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Block_Review_Form extends Mage_Core_Block_Template
+{
+    /**
+     * Collection of ratings
+     *
+     * @var array
+     */
+    protected $_ratings = null;
+
+    /**
+     * Render product review form xml
+     *
+     * @return string
+     */
+    protected function _toHtml()
+    {
+        $customer = Mage::getSingleton('customer/session')->getCustomer();
+        $xmlModel = Mage::getModel('xmlconnect/simplexml_element', '<node></node>');
+
+        $firstname = $ratingsXml = '';
+        if ($customer->getId()) {
+            $firstname = $xmlModel->xmlentities(strip_tags($customer->getFirstname()));
+        }
+
+        if ($this->getRatings()) {
+            foreach ($this->getRatings() as $rating) {
+                $ratingTitle = $xmlModel->xmlentities($rating->getRatingCode());
+                $ratingCode = strtolower($rating->getRatingCode());
+                $ratingCode = preg_replace('/[\W]+/', '_', $ratingCode);
+                $ratingsXml .= '
+    <fieldset name="rating_' . $ratingCode . '" title="' . $ratingTitle . '">';
+                foreach ($rating->getOptions() as $option) {
+                    $ratingsXml .= '
+        <field name="ratings[' . $rating->getId() . ']" value="'
+                        . $option->getId() . '" required="true" type="radio"/>';
+                }
+                $ratingsXml .= '
+    </fieldset>';
+            }
+        }
+
+        $xml = <<<EOT
+<form name="review_form" method="post">
+    <fieldset>
+        <field name="nickname" type="text" label="{$this->__('Nickname')}" required="true" value="{$firstname}" />
+        <field name="title" type="text" label="{$this->__('Summary of Your Review')}" required="true" />
+        <field name="detail" type="text" label="{$this->__('Review')}" required="true" />
+    </fieldset>{$ratingsXml}
+</form>
+EOT;
+
+        return $xml;
+    }
+
+    /**
+     * Returns collection of ratings
+     *
+     * @return array | false
+     */
+    public function getRatings()
+    {
+        if (is_null($this->_ratings)) {
+            $this->_ratings = Mage::getModel('rating/rating')
+                ->getResourceCollection()
+                ->addEntityFilter('product')
+                ->setPositionOrder()
+                ->addRatingPerStoreName(Mage::app()->getStore()->getId())
+                ->setStoreFilter(Mage::app()->getStore()->getId())
+                ->load()
+                ->addOptionToItems();
+
+            if (!$this->_ratings->getSize()) {
+                $this->_ratings = false;
+            }
+        }
+        return $this->_ratings;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Block/Wishlist.php b/app/code/core/Mage/XmlConnect/Block/Wishlist.php
index 5d487f3b61..aa25c12c49 100644
--- a/app/code/core/Mage/XmlConnect/Block/Wishlist.php
+++ b/app/code/core/Mage/XmlConnect/Block/Wishlist.php
@@ -50,10 +50,10 @@ protected function _toHtml()
         $offset = (int)$request->getParam('offset', 0);
         $count  = (int)$request->getParam('count', 0);
         $count  = $count <= 0 ? 1 : $count;
-        if ($offset + $count < $this->getWishlist()->getSize()) {
+        if ($offset + $count < $this->getWishlistItems()->getSize()) {
             $hasMoreItems = 1;
         }
-        $this->getWishlist()->getSelect()->limit($count, $offset);
+        $this->getWishlistItems()->getSelect()->limit($count, $offset);
 
         $wishlistXmlObj->addAttribute('items_count', $this->getWishlistItemsCount());
         $wishlistXmlObj->addAttribute('has_more_items', $hasMoreItems);
@@ -62,22 +62,29 @@ protected function _toHtml()
             /**
              * @var Mage_Wishlist_Model_Mysql4_Product_Collection
              */
-            foreach ($this->getWishlist() as $item) {
+            foreach ($this->getWishlistItems() as $item) {
                 $itemXmlObj = $wishlistXmlObj->addChild('item');
-                $itemXmlObj->addChild('item_id', $item->getWishlistItemId());
+
+                $itemXmlObj->addChild(
+                    'item_id',
+                    /** @var $item Mage_Wishlist_Model_Item */
+                    $item->getWishlistItemId()
+                );
+
                 $itemXmlObj->addChild('entity_id', $item->getProductId());
-                $itemXmlObj->addChild('entity_type_id', $item->getTypeId());
+                $itemXmlObj->addChild('entity_type_id', $item->getProduct()->getTypeId());
                 $itemXmlObj->addChild('name', $wishlistXmlObj->xmlentities(strip_tags($item->getName())));
-                $itemXmlObj->addChild('in_stock', (int)$item->isSalable());
+                $itemXmlObj->addChild('in_stock', (int)$item->getProduct()->isInStock());
+                $itemXmlObj->addChild('is_salable', (int)$item->getProduct()->getIsSalable());
                 /**
                  * If product type is grouped than it has options as its grouped items
                  */
-                if ($item->getTypeId() == Mage_Catalog_Model_Product_Type_Grouped::TYPE_CODE) {
+                if ($item->getProduct()->getTypeId() == Mage_Catalog_Model_Product_Type_Grouped::TYPE_CODE) {
                     $item->setHasOptions(true);
                 }
                 $itemXmlObj->addChild('has_options', (int)$item->getHasOptions());
 
-                $icon = $this->helper('catalog/image')->init($item, 'small_image')
+                $icon = $this->helper('catalog/image')->init($item->getProduct(), 'small_image')
                     ->resize(Mage::helper('xmlconnect/image')->getImageSizeForContent('product_small'));
 
                 $iconXml = $itemXmlObj->addChild('icon', $icon);
@@ -85,23 +92,25 @@ protected function _toHtml()
                 $file = Mage::helper('xmlconnect')->urlToPath($icon);
                 $iconXml->addAttribute('modification_time', filemtime($file));
 
+                $description = $wishlistXmlObj->xmlentities(strip_tags($item->getDescription()));
+                $itemXmlObj->addChild('description', $description);
 
-                $itemXmlObj->addChild('description', $wishlistXmlObj->xmlentities(strip_tags($item->getWishlistItemDescription())));
-                $itemXmlObj->addChild('added_date', $wishlistXmlObj->xmlentities($this->getFormatedDate($item->getAddedAt())));
+                $addedDate = $wishlistXmlObj->xmlentities($this->getFormatedDate($item->getAddedAt()));
+                $itemXmlObj->addChild('added_date', $addedDate);
 
                 if ($this->getChild('product_price')) {
-                    $this->getChild('product_price')->setProduct($item)
+                    $this->getChild('product_price')->setProduct($item->getProduct())
                        ->setProductXmlObj($itemXmlObj)
                        ->collectProductPrices();
                 }
 
-                if (!$item->getRatingSummary()) {
+                if (!$item->getProduct()->getRatingSummary()) {
                     Mage::getModel('review/review')
-                       ->getEntitySummary($item, Mage::app()->getStore()->getId());
+                       ->getEntitySummary($item->getProduct(), Mage::app()->getStore()->getId());
                 }
-
-                $itemXmlObj->addChild('rating_summary', round((int)$item->getRatingSummary()->getRatingSummary() / 10));
-                $itemXmlObj->addChild('reviews_count', $item->getRatingSummary()->getReviewsCount());
+                $ratingSummary = (int)$item->getProduct()->getRatingSummary()->getRatingSummary();
+                $itemXmlObj->addChild('rating_summary', round($ratingSummary / 10));
+                $itemXmlObj->addChild('reviews_count', $item->getProduct()->getRatingSummary()->getReviewsCount());
             }
         }
 
diff --git a/app/code/core/Mage/XmlConnect/Controller/Action.php b/app/code/core/Mage/XmlConnect/Controller/Action.php
index 3b8eb87340..d44417f0e2 100644
--- a/app/code/core/Mage/XmlConnect/Controller/Action.php
+++ b/app/code/core/Mage/XmlConnect/Controller/Action.php
@@ -24,6 +24,13 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+/**
+ * XmlConnect controller abstract
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
 abstract class Mage_XmlConnect_Controller_Action extends Mage_Core_Controller_Front_Action
 {
     /**
@@ -70,37 +77,50 @@ abstract class Mage_XmlConnect_Controller_Action extends Mage_Core_Controller_Fr
     public function preDispatch()
     {
         parent::preDispatch();
-        
-        $this->getResponse()->setHeader('Content-type', 'text/xml; charset=UTF-8');
 
+        $this->getResponse()->setHeader('Content-type', 'text/xml; charset=UTF-8');
         /**
          * Load application by specified code and make sure that application exists
          */
         $cookieName = Mage_XmlConnect_Model_Application::APP_CODE_COOKIE_NAME;
-        $appCode = isset($_COOKIE[$cookieName]) ? (string) $_COOKIE[$cookieName] : '';
+        $appCode    = isset($_COOKIE[$cookieName]) ? (string) $_COOKIE[$cookieName] : '';
         $screenSizeCookieName = Mage_XmlConnect_Model_Application::APP_SCREEN_SIZE_NAME;
         $screenSize = isset($_COOKIE[$screenSizeCookieName]) ? (string) $_COOKIE[$screenSizeCookieName] : '';
         if (!$appCode) {
-            $this->_message(Mage::helper('xmlconnect')->__('Specified invalid app code.'), self::MESSAGE_STATUS_ERROR);
+            $this->_message(
+                Mage::helper('xmlconnect')->__('Specified invalid app code.'),
+                self::MESSAGE_STATUS_ERROR
+            );
             $this->setFlag('', self::FLAG_NO_DISPATCH, true);
             return;
         }
         /**
          * Check is website offline
          */
-        if ((int)Mage::getStoreConfig('general/restriction/is_active') && (int)Mage::getStoreConfig('general/restriction/mode') == 0) {
-            $this->_message(Mage::helper('xmlconnect')->__('Website is offline.'), self::MESSAGE_STATUS_SUCCESS);
+        if ((int)Mage::getStoreConfig('general/restriction/is_active')
+            && (int)Mage::getStoreConfig('general/restriction/mode') == 0
+        ) {
+            $this->_message(
+                Mage::helper('xmlconnect')->__('Website is offline.'),
+                self::MESSAGE_STATUS_SUCCESS
+            );
             $this->setFlag('', self::FLAG_NO_DISPATCH, true);
             return;
         }
+        /** @var $appModel Mage_XmlConnect_Model_Application */
         $appModel = Mage::getModel('xmlconnect/application')->loadByCode($appCode);
         $appModel->setScreenSize($screenSize);
         if ($appModel && $appModel->getId()) {
-            Mage::app()->setCurrentStore(Mage::app()->getStore($appModel->getStoreId())->getCode());
+            Mage::app()->setCurrentStore(
+                Mage::app()->getStore($appModel->getStoreId())->getCode()
+            );
             Mage::getSingleton('core/locale')->emulate($appModel->getStoreId());
             Mage::register('current_app', $appModel);
         } else {
-            $this->_message(Mage::helper('xmlconnect')->__('Specified invalid app code.'), self::MESSAGE_STATUS_ERROR);
+            $this->_message(
+                Mage::helper('xmlconnect')->__('Specified invalid app code.'),
+                self::MESSAGE_STATUS_ERROR
+            );
             $this->setFlag('', self::FLAG_NO_DISPATCH, true);
             return;
         }
@@ -125,7 +145,7 @@ public function postDispatch()
 
     /**
      * Generate message xml and set it to response body
-     * 
+     *
      * @param string $text
      * @param string $status
      * @param string $type
@@ -134,7 +154,7 @@ public function postDispatch()
      */
     protected function _message($text, $status, $type='', $action='')
     {
-        $message = new Mage_XmlConnect_Model_Simplexml_Element('<message></message>');
+        $message = Mage::getModel('xmlconnect/simplexml_element', '<message></message>');
         $message->addChild('status', $status);
         $message->addChild('text', $text);
         $this->getResponse()->setBody($message->asNiceXml());
diff --git a/app/code/core/Mage/XmlConnect/Helper/Android.php b/app/code/core/Mage/XmlConnect/Helper/Android.php
index 24730d13e6..e6954bc556 100755
--- a/app/code/core/Mage/XmlConnect/Helper/Android.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Android.php
@@ -24,21 +24,28 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+/**
+ * XmlConnect device helper for Android
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
 class Mage_XmlConnect_Helper_Android extends Mage_Core_Helper_Abstract
 {
     /**
-     * Android landscape orientation identificator
+     * Submission title length
      *
-     * @var string
+     * @var int
      */
-    const ORIENTATION_LANDSCAPE = 'landscape';
+    const SUBMISSION_TITLE_LENGTH = 30;
 
     /**
-     * Android portrait orientation identificator
+     * Submission description length
      *
-     * @var string
+     * @var int
      */
-    const ORIENTATION_PORTRAIT = 'portrait';
+    const SUBMISSION_DESCRIPTION_LENGTH = 4000;
 
     /**
      * Android preview banner widht
@@ -55,46 +62,97 @@ class Mage_XmlConnect_Helper_Android extends Mage_Core_Helper_Abstract
     const PREVIEW_BANNER_HEIGHT = 258;
 
     /**
-     * Android landscape orientation preview image widht
+     * Tags identifier for title bar
      *
      * @var int
      */
-    const PREVIEW_LANDSCAPE_BACKGROUND_WIDTH = 480;
+    const TAGS_ID_FOR_TITLE_BAR = 1;
 
     /**
-     * Android landscape orientation preview image height
+     * Tags identifier for options menu
      *
      * @var int
      */
-    const PREVIEW_LANDSCAPE_BACKGROUND_HEIGHT = 250;
+    const TAGS_ID_FOR_OPTION_MENU = 2;
 
     /**
-     * Android portrait orientation preview image widht
+     * Country renderer for submission
      *
-     * @var int
+     * @var string
      */
-    const PREVIEW_PORTRAIT_BACKGROUND_WIDTH = 320;
+    const SUBMISSION_COUNTRY_RENDERER = 'androidmarket';
 
     /**
-     * Android portrait orientation preview image height
+     * Country columns for submission
      *
      * @var int
      */
-    const PREVIEW_PORTRAIT_BACKGROUND_HEIGHT = 410;
+    const SUBMISSION_COUNTRY_COLUMNS = 2;
 
     /**
-     * Tags identifier for title bar
+     * Submit images that are stored in "params" field of history table
      *
-     * @var int
+     * @var array
      */
-    const TAGS_ID_FOR_TITLE_BAR = 1;
+    protected $_imageIds = array('icon', 'android_loader_image', 'android_logo', 'big_logo');
 
     /**
-     * Tags identifier for options menu
+     * Country field renderer
      *
-     * @var int
+     * @var Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Renderer_Country_Androidmarket
      */
-    const TAGS_ID_FOR_OPTION_MENU = 2;
+    protected $_countryRenderer = null;
+
+    /**
+     * Get submit images that are required for application submit
+     *
+     * @return array
+     */
+    public function getSubmitImages()
+    {
+        return $this->_imageIds;
+    }
+
+    /**
+     * List of coutries that allowed in Ituens by Apple Store
+     *
+     * array(
+     *      'country name' => 'country id at directory model'
+     * )
+     *
+     * @var array
+     */
+    protected $_allowedCountries = array(
+                'Argentina' => 'AR',
+                'Australia' => 'AU',
+                'Austria' => 'AT',
+                'Belgium' => 'BE',
+                'Brazil' =>'BR',
+                'Canada' => 'CA',
+                'Denmark' => 'DK',
+                'Finland' => 'FI',
+                'France' => 'FR',
+                'Germany' => 'DE',
+                'Hong Kong SAR China' => 'HK',
+                'Ireland' => 'IE',
+                'Israel' => 'IL',
+                'Italy' => 'IT',
+                'Japan' => 'JP',
+                'Mexico' => 'MX',
+                'Netherlands' => 'NL',
+                'New Zealand' => 'NZ',
+                'Norway' => 'NO',
+                'Portugal' => 'PT',
+                'Russia' => 'RU',
+                'Singapore' => 'SG',
+                'Spain' => 'ES',
+                'South Korea' => 'KR',
+                'Sweden' => 'SE',
+                'Switzerland' => 'CH',
+                'Taiwan' => 'TW',
+                'United Kingdom' => 'GB',
+                'United States' => 'US',
+    );
 
     /**
      * Get default application tabs
@@ -459,4 +517,217 @@ public function getFontSizes()
         }
         return $result;
     }
+
+    /**
+     * Validate submit application data
+     *
+     * @param array $params
+     * @return array
+     */
+    public function validateSubmit($params)
+    {
+        $errors = array();
+
+        if (!Zend_Validate::is(isset($params['title']) ? $params['title'] : null, 'NotEmpty')) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please enter the Title.');
+        }
+
+        if (isset($params['title'])) {
+            $titleLength = self::SUBMISSION_TITLE_LENGTH;
+            $strRules = array('min' => '1', 'max' => $titleLength);
+            if (!Zend_Validate::is($params['title'], 'StringLength', $strRules)) {
+                $errors[] = Mage::helper('xmlconnect')->__('"Title" is more than %d characters long', $strRules['max']);
+            }
+        }
+
+        if (!Zend_Validate::is(isset($params['description']) ? $params['description'] : null, 'NotEmpty')) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please enter the Description.');
+        }
+
+        if (isset($params['description'])) {
+            $descriptionLength = self::SUBMISSION_DESCRIPTION_LENGTH;
+            $strRules = array('min' => '1', 'max' => $descriptionLength);
+            if (!Zend_Validate::is($params['title'], 'StringLength', $strRules)) {
+                $errors[] = Mage::helper('xmlconnect')->__('"Description" is more than %d characters long', $strRules['max']);
+            }
+        }
+
+        if (!Zend_Validate::is(isset($params['copyright']) ? $params['copyright'] : null, 'NotEmpty')) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please enter the Copyright.');
+        }
+
+        if (empty($params['price_free'])) {
+            if (!Zend_Validate::is(isset($params['price']) ? $params['price'] : null, 'NotEmpty')) {
+                $errors[] = Mage::helper('xmlconnect')->__('Please enter the Price.');
+            }
+        }
+
+        if (!Zend_Validate::is(isset($params['country']) ? $params['country'] : null, 'NotEmpty')) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please select at least one country.');
+        }
+
+        $keyLenght = Mage_XmlConnect_Model_Application::APP_MAX_KEY_LENGTH;
+        if (Mage::helper('xmlconnect')->getApplication()->getIsResubmitAction()) {
+            if (isset($params['resubmission_activation_key'])) {
+                $resubmissionKey = $params['resubmission_activation_key'];
+            } else {
+                $resubmissionKey = null;
+            }
+
+            if (!Zend_Validate::is($resubmissionKey, 'NotEmpty')) {
+                $errors[] = Mage::helper('xmlconnect')->__('Please enter the Resubmission Key.');
+            } else if (!Zend_Validate::is($resubmissionKey, 'StringLength', array(1, $keyLenght))) {
+                $errors[] = Mage::helper('xmlconnect')->__('Submit App failure. Invalid activation key provided');
+            }
+        } else {
+            $key = isset($params['key']) ? $params['key'] : null;
+            if (!Zend_Validate::is($key, 'NotEmpty')) {
+                $errors[] = Mage::helper('xmlconnect')->__('Please enter the Activation Key.');
+            } else if (!Zend_Validate::is($key, 'StringLength', array(1, $keyLenght))) {
+                $errors[] = Mage::helper('xmlconnect')->__('Submit App failure. Invalid activation key provided');
+            }
+        }
+        return $errors;
+    }
+
+    /**
+     * Check config for valid values
+     *
+     * @param array $native
+     * @return array
+     */
+    public function validateConfig($native)
+    {
+        $errors = array();
+        if ( ($native === false)
+            || (!isset($native['navigationBar']) || !is_array($native['navigationBar'])
+            || !isset($native['navigationBar']['icon'])
+            || !Zend_Validate::is($native['navigationBar']['icon'], 'NotEmpty'))) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "Logo in Header" field from Design Tab.');
+        }
+
+        if (!Mage::helper('xmlconnect')->validateConfFieldNotEmpty('bannerAndroidImage', $native)) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "Banner on Home Screen" field from Design Tab.');
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Get renderer for submission country
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Renderer_Country_Androidmarket
+     */
+    public function getCountryRenderer()
+    {
+        if (empty($this->_countryRenderer)) {
+            $renderer = 'xmlconnect/adminhtml_mobile_submission_renderer_country_'
+                . self::SUBMISSION_COUNTRY_RENDERER;
+            $this->_countryRenderer = Mage::app()->getLayout()->createBlock($renderer);
+        }
+        return $this->_countryRenderer;
+    }
+
+    /**
+     * Get label for submission country
+     *
+     * @return string
+     */
+    public function getCountryLabel()
+    {
+        return Mage::helper('xmlconnect')->__('Locations');
+    }
+
+    /**
+     * Get columns for submission country
+     *
+     * @return int
+     */
+    public function getCountryColumns()
+    {
+        return self::SUBMISSION_COUNTRY_COLUMNS;
+    }
+
+    /**
+     * Get placement of Country Names for submission country
+     *
+     * @return bool
+     */
+    public function isCountryNamePlaceLeft()
+    {
+        return false;
+    }
+
+    /**
+     * Get class name for submission country
+     *
+     * @return string
+     */
+    public function getCountryClass()
+    {
+        return self::SUBMISSION_COUNTRY_RENDERER;
+    }
+
+    /**
+     * Get list of countries that allowed by Magento Inc. for Android
+     *
+     * @return array
+     */
+    public function getAndroidMarketCountriesArray()
+    {
+        return $this->_allowedCountries;
+    }
+
+    /**
+     * Check image fields
+     *
+     * We set empty value for image field if file was missed in some reason
+     *
+     * @param array $data
+     * @return array
+     */
+    public function checkImages(array $data)
+    {
+        if (isset($data['conf']['native']['navigationBar']['icon']) &&
+            !file_exists($data['conf']['native']['navigationBar']['icon'])
+        ) {
+            $data['conf']['native']['navigationBar']['icon'] = '';
+        }
+
+        if (isset($data['conf']['native']['body']['bannerAndroidImage']) &&
+            !file_exists($data['conf']['native']['body']['bannerAndroidImage'])
+        ) {
+            $data['conf']['native']['body']['bannerAndroidImage'] = '';
+        }
+        return $data;
+    }
+
+    /**
+     * Check required fields of a config for a front-end
+     *
+     * @throws Mage_Core_Exception
+     * @param array $data
+     * @return void
+     */
+    public function checkRequiredConfigFields($data)
+    {
+        if (!is_array($data)) {
+            return;
+        }
+
+        if (isset($data['navigationBar']['icon'])
+            && empty($data['navigationBar']['icon'])
+        ) {
+            Mage::throwException(
+                Mage::helper('xmlconnect')->__('Logo in Header image missing.')
+            );
+        }
+        if (isset($data['body']['bannerAndroidImage'])
+            && empty($data['body']['bannerAndroidImage'])
+        ) {
+            Mage::throwException(
+                Mage::helper('xmlconnect')->__('Banner on Home Screen image missing.')
+            );
+        }
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Helper/Data.php b/app/code/core/Mage/XmlConnect/Helper/Data.php
index ccc1ac14f2..c7692dd414 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Data.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Data.php
@@ -40,6 +40,11 @@ class Mage_XmlConnect_Helper_Data extends Mage_Core_Helper_Abstract
      */
     const MESSAGE_TITLE_LENGTH = 255;
 
+    /**
+     * List of the keys for xml config that have to be excluded form application config
+     *
+     * @var array
+     */
     protected $_excludedXmlConfigKeys = array(
         'notifications/applicationMasterSecret',
     );
@@ -93,6 +98,52 @@ class Mage_XmlConnect_Helper_Data extends Mage_Core_Helper_Abstract
      */
     const DEVICE_TYPE_ANDROID = 'android';
 
+    /**
+     * Social network Twitter id
+     *
+     * @var string
+     */
+    const SOCIAL_NETWORK_TWITTER = 'twitter';
+
+    /**
+     * Social network Facebook id
+     *
+     * @var string
+     */
+    const SOCIAL_NETWORK_FACEBOOK = 'facebook';
+
+    /**
+     * Social network LinkedIn id
+     *
+     * @var string
+     */
+    const SOCIAL_NETWORK_LINKEDIN = 'linkedin';
+
+    /**
+     * Get device preview model
+     *
+     * @throws Mage_Core_Exception
+     * @return Mage_XmlConnect_Model_Preview_Abstract
+     */
+    public function getPreviewModel()
+    {
+        $deviceType = $this->getDeviceType();
+
+        switch ($deviceType) {
+            case self::DEVICE_TYPE_IPHONE:
+            case self::DEVICE_TYPE_IPAD:
+            case self::DEVICE_TYPE_ANDROID:
+                $previewModel = Mage::getSingleton('xmlconnect/preview_' . strtolower($deviceType));
+                break;
+            default:
+                Mage::throwException(
+                    Mage::helper('xmlconnect')->__('Device doesn\'t recognized: "%s". Unable to load preview model.', $deviceType)
+                );
+                break;
+        }
+        return $previewModel;
+    }
+
     /**
      * Get device helper
      *
@@ -111,7 +162,9 @@ public function getDeviceHelper($application = null)
                 $helper =  Mage::helper('xmlconnect/' . $deviceType);
                 break;
             default:
-                Mage::throwException(Mage::helper('xmlconnect')->__('Device doesn\'t recognized: "%s". Unable to load a helper.', $deviceType));
+                Mage::throwException(
+                    Mage::helper('xmlconnect')->__('Device doesn\'t recognized: "%s". Unable to load a helper.', $deviceType)
+                );
                 break;
         }
         return $helper;
@@ -191,46 +244,56 @@ public function getUrl($route, $params = array())
     }
 
     /**
-     * Retrieve country options array
+     * Retrieve device specific country options array
      *
+     * @throws Mage_Core_Exception
      * @param bool $isItunes
      * @return array
      */
     public function getCountryOptionsArray($isItunes = false)
     {
         Varien_Profiler::start('TEST: '.__METHOD__);
-        switch ($this->getDeviceType()) {
+        $deviceType = $this->getDeviceType();
+        switch ($deviceType) {
             case self::DEVICE_TYPE_IPHONE:
             case self::DEVICE_TYPE_IPAD:
                 $cacheKey = 'XMLCONNECT_COUNTRY_ITUNES_SELECT_STORE_'.Mage::app()->getStore()->getCode();
-                $itunesCountries = $this->getDeviceHelper()->getItunesCountriesArray();
+                $deviceCountries = $this->getDeviceHelper()->getItunesCountriesArray();
                 break;
             case self::DEVICE_TYPE_ANDROID:
+                $cacheKey = 'XMLCONNECT_COUNTRY_ANDROID_SELECT_STORE_'.Mage::app()->getStore()->getCode();
+                $deviceCountries = $this->getDeviceHelper()->getAndroidMarketCountriesArray();
+                break;
             default:
-                $cacheKey = 'XMLCONNECT_COUNTRY_SELECT_STORE_'.Mage::app()->getStore()->getCode();
+                Mage::throwException(
+                    Mage::helper('xmlconnect')->__('Country options don\'t recognized for "%s".', $deviceType)
+                );
                 break;
         }
 
-        if (false && Mage::app()->useCache('config') && $cache = Mage::app()->loadCache($cacheKey)) {
+        if (Mage::app()->useCache('config') && $cache = Mage::app()->loadCache($cacheKey)) {
             $options = unserialize($cache);
         } else {
-            if (isset($itunesCountries)) {
+            if (isset($deviceCountries)) {
                 $options = Mage::getModel('directory/country')
                     ->getResourceCollection()
-                    ->addFieldToFilter('country_id', array('in' => $itunesCountries))
+                    ->addFieldToFilter('country_id', array('in' => $deviceCountries))
                     ->loadByStore()
-                    ->toOptionArray();
-            } else {
-                $options = Mage::getModel('directory/country')
-                    ->getResourceCollection()
-                    ->loadByStore()
-                    ->toOptionArray();
+                    ->toOptionArray(false);
             }
             if (Mage::app()->useCache('config')) {
                 Mage::app()->saveCache(serialize($options), $cacheKey, array('config'));
             }
         }
         Varien_Profiler::stop('TEST: '.__METHOD__);
+
+        if (count($options)) {
+            $options[] = array(
+                'value' => 'NEW_COUNTRIES',
+                'label' => 'New Territories As Added'
+            );
+        }
+
         return $options;
     }
 
@@ -273,9 +336,7 @@ public function getDeviceTypeOptions()
     {
         $devices = self::getSupportedDevices();
         $options = array();
-        if (count($devices) > 1) {
-            $options[] = array('value' => '', 'label' => Mage::helper('xmlconnect')->__('Please Select Device Type'));
-        }
+        $options[] = array('value' => '', 'label' => Mage::helper('xmlconnect')->__('Please Select Device Type'));
         foreach ($devices as $type => $label) {
             $options[] = array('value' => $type, 'label' => $label);
         }
@@ -294,7 +355,19 @@ public function getDefaultApplicationDesignTabs()
     }
 
     /**
-     * Return array for tabs like  label -> action array
+     * Get default Cache Lifetime
+     *
+     * @return int
+     */
+    public function getDefaultCacheLifetime()
+    {
+        return (int)Mage::getStoreConfig(
+            Mage_XmlConnect_Model_Application::XML_PATH_DEFAULT_CACHE_LIFETIME
+        );
+    }
+
+    /**
+     * Return array for tabs like label -> action array
      *
      * @return array
      */
@@ -323,7 +396,7 @@ public function getTabLabel($action)
     }
 
     /**
-     * Merges $changes array to $target array recursive, overwriting existing key,  and adding new one
+     * Merges $changes array to $target array recursive, overwriting existing key, and adding new one
      *
      * @param mixed $target
      * @param mixed $changes
@@ -364,9 +437,10 @@ static public function arrayMergeRecursive($target, $changes)
      */
     public function htmlize($body)
     {
+        $w3cUrl = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd';
         return <<<EOT
 &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&quot;&gt;
+&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Strict//EN&quot; &quot;$w3cUrl&quot;&gt;
 &lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; xml:lang=&quot;en&quot; lang=&quot;en&quot;&gt;
 &lt;head&gt;
 &lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;style.css&quot; media=&quot;screen&quot;/&gt;
@@ -408,6 +482,7 @@ public function getArrayAsXmlItemValues($dataArray, $selected)
      */
     public function getSoloXml($ssCcMonths, $ssCcYears)
     {
+        $validatorMessage = $this->__('Please enter issue number or start date for switch/solo card type.');
         // issue number ==== validate-cc-ukss cvv
         $solo = <<<EOT
 <fieldset_optional>
@@ -421,7 +496,7 @@ public function getSoloXml($ssCcMonths, $ssCcYears)
 
     <field name="payment[cc_ss_issue]" type="text" label="{$this->__('Issue Number')}">
         <validators>
-            <validator relation="payment[cc_type]" type="credit_card_ukss" message="{$this->__('Please enter issue number or start date for switch/solo card type.')}"/>
+            <validator relation="payment[cc_type]" type="credit_card_ukss" message="{$validatorMessage}"/>
         </validators>
     </field>;
     <field name="payment[cc_ss_start_month]" type="select" label="{$this->__('Start Date - Month')}">
@@ -522,7 +597,6 @@ public function getApplicationOptions()
     /**
      * Get applications array like `code` as `name`
      *
-     * @param
      * @staticvar array $apps
      * @return array
      */
@@ -567,7 +641,9 @@ public function sendBroadcastMessage(Mage_XmlConnect_Model_Queue $queue)
             $app = Mage::getModel('xmlconnect/application')->load($appCode, 'code');
 
             if (!$app->getId()) {
-                Mage::throwException(Mage::helper('xmlconnect')->__('Can\'t load application with code "%s"', $appCode));
+                Mage::throwException(
+                    Mage::helper('xmlconnect')->__('Can\'t load application with code "%s"', $appCode)
+                );
             }
 
             $userpwd = $app->getUserpwd();
@@ -575,13 +651,15 @@ public function sendBroadcastMessage(Mage_XmlConnect_Model_Queue $queue)
             $sendType = $queue->getData('type');
             switch ($sendType) {
                 case Mage_XmlConnect_Model_Queue::MESSAGE_TYPE_AIRMAIL:
-                    $broadcastUrl = Mage::getStoreConfig('xmlconnect/' . Mage_XmlConnect_Model_Queue::MESSAGE_TYPE_AIRMAIL . '/broadcast_url');
+                    $configPath = 'xmlconnect/' . Mage_XmlConnect_Model_Queue::MESSAGE_TYPE_AIRMAIL . '/broadcast_url';
+                    $broadcastUrl = Mage::getStoreConfig($configPath);
                     $params = $queue->getAirmailBroadcastParams();
                     break;
 
                 case Mage_XmlConnect_Model_Queue::MESSAGE_TYPE_PUSH:
                 default:
-                    $broadcastUrl = Mage::getStoreConfig('xmlconnect/' . Mage_XmlConnect_Model_Queue::MESSAGE_TYPE_PUSH . '/broadcast_url');
+                    $configPath = 'xmlconnect/' . Mage_XmlConnect_Model_Queue::MESSAGE_TYPE_PUSH . '/broadcast_url';
+                    $broadcastUrl = Mage::getStoreConfig($configPath);
                     $params = $queue->getPushBroadcastParams();
                     break;
             }
diff --git a/app/code/core/Mage/XmlConnect/Helper/Image.php b/app/code/core/Mage/XmlConnect/Helper/Image.php
index 3a51b8a5e0..7ed69bf91e 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Image.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Image.php
@@ -75,10 +75,11 @@ public function handleUpload($field, &$target)
         $uploadedFilename = '';
         $uploadDir = $this->getOriginalSizeUploadDir();
 
-        $this->_forcedConvertPng($field);
-
         try {
-            $uploader = new Varien_File_Uploader($field);
+            $this->_forcedConvertPng($field);
+
+            /** @var $uploader Mage_Core_Model_File_Uploader */
+            $uploader = Mage::getModel('core/file_uploader', $field);
             $uploader->setAllowedExtensions(array('jpg', 'jpeg', 'gif', 'png'));
             $uploader->setAllowRenameFiles(true);
             $uploader->save($uploadDir);
@@ -88,7 +89,9 @@ public function handleUpload($field, &$target)
             /**
              * Hard coded exception catch
              */
-            if ($e->getMessage() == 'Disallowed file type.') {
+            if (!strlen($_FILES[$field]['tmp_name'])) {
+                Mage::throwException(Mage::helper('xmlconnect')->__('File can\'t be uploaded.'));
+            } elseif ($e->getMessage() == 'Disallowed file type.') {
                 $filename = $_FILES[$field]['name'];
                 Mage::throwException(Mage::helper('xmlconnect')->__('Error while uploading file "%s". Disallowed file type. Only "jpg", "jpeg", "gif", "png" are allowed.', $filename));
             } else {
@@ -111,6 +114,7 @@ protected function _getScreenSize()
     /**
      * Return correct system filename for current screenSize
      *
+     * @throws Mage_Core_Exception
      * @param string $fieldPath
      * @param string $fileName
      * @param string $default
@@ -340,6 +344,68 @@ public function getImageSizeForInterface($imagePath)
         return $size;
     }
 
+    /**
+     * Return the filesystem path to XmlConnect media files
+     *
+     * @param string $path Right part of the path
+     * @return string
+     */
+    public function getMediaPath($path = '')
+    {
+        $path = trim($path);
+        $result = Mage::getBaseDir('media') . DS . 'xmlconnect';
+
+        if (!empty($path)) {
+            if (strpos($path, DS) === 0) {
+                $path = substr($path, 1);
+            }
+            $result .= DS . $path;
+        }
+        return $result;
+    }
+
+    /**
+     * Return Url for media image
+     *
+     * @param string $image
+     * @return string
+     */
+    public function getMediaUrl($image = '')
+    {
+        $image = trim($image);
+        $result = Mage::getBaseUrl('media') . 'xmlconnect';
+
+        if (!empty($image)) {
+            if (strpos($image, '/') === 0) {
+                $image = substr($image, 1);
+            }
+            $result .= '/' . $image;
+        }
+        return $result;
+    }
+
+    /**
+     * Return URL for default design image
+     *
+     * @param string $image
+     * @return string
+     */
+    public function getDefaultDesignUrl($image = '')
+    {
+        return $this->getSkinImagesUrl($this->getDefaultDesignSuffixAsUrl($image));
+    }
+
+    /**
+     * Return suffix as URL for default design image
+     *
+     * @param string $image
+     * @return string
+     */
+    public function getDefaultDesignSuffixAsUrl($image = '')
+    {
+        return 'design_default/' . trim(ltrim($image, '/'));
+    }
+
     /**
      * Retrieve thumbnail image url
      *
diff --git a/app/code/core/Mage/XmlConnect/Helper/Ipad.php b/app/code/core/Mage/XmlConnect/Helper/Ipad.php
index b72ade105a..6ff940871a 100755
--- a/app/code/core/Mage/XmlConnect/Helper/Ipad.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Ipad.php
@@ -24,8 +24,29 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+/**
+ * XmlConnect device helper for iPad
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
 class Mage_XmlConnect_Helper_Ipad extends Mage_Core_Helper_Abstract
 {
+    /**
+     * Submission title length
+     *
+     * @var int
+     */
+    const SUBMISSION_TITLE_LENGTH = 200;
+
+    /**
+     * Submission description length
+     *
+     * @var int
+     */
+    const SUBMISSION_DESCRIPTION_LENGTH = 500;
+
     /**
      * Ipad landscape orientation identificator
      *
@@ -82,6 +103,35 @@ class Mage_XmlConnect_Helper_Ipad extends Mage_Core_Helper_Abstract
      */
     const PREVIEW_PORTRAIT_BACKGROUND_HEIGHT = 438;
 
+    /**
+     * Submit images that are stored in "params" field of history table
+     *
+     * @var array
+     */
+    protected $_imageIds = array('icon',
+        'ipad_loader_portrait_image',
+        'ipad_loader_landscape_image',
+        'ipad_logo',
+        'big_logo'
+    );
+
+    /**
+     * Country field renderer
+     *
+     * @var Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Renderer_Country_Istore
+     */
+    protected $_countryRenderer = null;
+
+    /**
+     * Get submit images that are required for application submit
+     *
+     * @return array
+     */
+    public function getSubmitImages()
+    {
+        return $this->_imageIds;
+    }
+
     /**
      * Get default application tabs
      *
@@ -97,11 +147,6 @@ public function getDefaultDesignTabs()
                     'image' => 'tab_home.png',
                     'action' => 'Home',
                 ),
-                array(
-                    'label' => Mage::helper('xmlconnect')->__('Shop'),
-                    'image' => 'tab_shop.png',
-                    'action' => 'Shop',
-                ),
                 array(
                     'label' => Mage::helper('xmlconnect')->__('Search'),
                     'image' => 'tab_search.png',
@@ -117,11 +162,6 @@ public function getDefaultDesignTabs()
                     'image' => 'tab_account_ipad.png',
                     'action' => 'Account',
                 ),
-                array(
-                    'label' => Mage::helper('xmlconnect')->__('More Info'),
-                    'image' => 'tab_page.png',
-                    'action' => 'AboutUs',
-                ),
             );
         }
         return $this->_tabs;
@@ -441,8 +481,8 @@ public function getFontSizes()
     }
 
     /**
-     * Get list of coutries that allowed in Ituens by Apple Store for Ipad
-     * (get info from Iphone helper)
+     * Get list of countries that allowed in Itunes by Apple Store for Ipad
+     * (we get info from Iphone helper)
      *
      * @return array
      */
@@ -450,4 +490,239 @@ public function getItunesCountriesArray()
     {
         return Mage::helper('xmlconnect/iphone')->getItunesCountriesArray();
     }
+
+    /**
+     * Validate submit application data
+     *
+     * @param array $params
+     * @return array
+     */
+    public function validateSubmit($params)
+    {
+        $errors = array();
+
+        if (!Zend_Validate::is(isset($params['title']) ? $params['title'] : null, 'NotEmpty')) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please enter the Title.');
+        }
+
+        if (isset($params['title'])) {
+            $titleLength = self::SUBMISSION_TITLE_LENGTH;
+            $strRules = array('min' => '1', 'max' => $titleLength);
+            if (!Zend_Validate::is($params['title'], 'StringLength', $strRules)) {
+                $errors[] = Mage::helper('xmlconnect')->__('"Title" is more than %d characters long', $strRules['max']);
+            }
+        }
+
+        if (!Zend_Validate::is(isset($params['description']) ? $params['description'] : null, 'NotEmpty')) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please enter the Description.');
+        }
+
+        if (isset($params['description'])) {
+            $descriptionLength = self::SUBMISSION_DESCRIPTION_LENGTH;
+            $strRules = array('min' => '1', 'max' => $descriptionLength);
+            if (!Zend_Validate::is($params['title'], 'StringLength', $strRules)) {
+                $errors[] = Mage::helper('xmlconnect')->__('"Description" is more than %d characters long', $strRules['max']);
+            }
+        }
+
+        if (!Zend_Validate::is(isset($params['copyright']) ? $params['copyright'] : null, 'NotEmpty')) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please enter the Copyright.');
+        }
+
+        if (empty($params['price_free'])) {
+            if (!Zend_Validate::is(isset($params['price']) ? $params['price'] : null, 'NotEmpty')) {
+                $errors[] = Mage::helper('xmlconnect')->__('Please enter the Price.');
+            }
+        }
+
+        if (!Zend_Validate::is(isset($params['country']) ? $params['country'] : null, 'NotEmpty')) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please select at least one country.');
+        }
+
+        $keyLenght = Mage_XmlConnect_Model_Application::APP_MAX_KEY_LENGTH;
+        if (Mage::helper('xmlconnect')->getApplication()->getIsResubmitAction()) {
+            if (isset($params['resubmission_activation_key'])) {
+                $resubmissionKey = $params['resubmission_activation_key'];
+            } else {
+                $resubmissionKey = null;
+            }
+            if (!Zend_Validate::is($resubmissionKey, 'NotEmpty')) {
+                $errors[] = Mage::helper('xmlconnect')->__('Please enter the Resubmission Key.');
+            } else if (!Zend_Validate::is($resubmissionKey, 'StringLength', array(1, $keyLenght))) {
+                $errors[] = Mage::helper('xmlconnect')->__('Submit App failure. Invalid activation key provided');
+            }
+        } else {
+            $key = isset($params['key']) ? $params['key'] : null;
+            if (!Zend_Validate::is($key, 'NotEmpty')) {
+                $errors[] = Mage::helper('xmlconnect')->__('Please enter the Activation Key.');
+            } else if (!Zend_Validate::is($key, 'StringLength', array(1, $keyLenght))) {
+                $errors[] = Mage::helper('xmlconnect')->__('Submit App failure. Invalid activation key provided');
+            }
+        }
+        return $errors;
+    }
+
+    /**
+     * Check config for valid values
+     *
+     * @param array $native
+     * @return array
+     */
+    public function validateConfig($native)
+    {
+        $errors = array();
+        if ( ($native === false)
+            || (!isset($native['navigationBar']) || !is_array($native['navigationBar'])
+            || !isset($native['navigationBar']['icon'])
+            || !Zend_Validate::is($native['navigationBar']['icon'], 'NotEmpty'))) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "Logo in Header" field from Design Tab.');
+        }
+
+        if (!Mage::helper('xmlconnect')->validateConfFieldNotEmpty('bannerIpadImage', $native)) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "Banner on Home Screen" field from Design Tab.');
+        }
+
+        if (!Mage::helper('xmlconnect')->validateConfFieldNotEmpty('backgroundIpadLandscapeImage', $native)) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "App Background (landscape mode)" field from Design Tab.');
+        }
+
+        if (!Mage::helper('xmlconnect')->validateConfFieldNotEmpty('backgroundIpadPortraitImage', $native)) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "App Background (portrait mode)" field from Design Tab.');
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Get renderer for submission country
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Renderer_Country_Istore
+     */
+    public function getCountryRenderer()
+    {
+        if (empty($this->_countryRenderer)) {
+            $renderer = 'xmlconnect/adminhtml_mobile_submission_renderer_country_'
+                . Mage_XmlConnect_Helper_Iphone::SUBMISSION_COUNTRY_RENDERER;
+            $this->_countryRenderer = Mage::app()->getLayout()->createBlock($renderer);
+        }
+        return $this->_countryRenderer;
+    }
+
+    /**
+     * Get label for submission country
+     *
+     * @return string
+     */
+    public function getCountryLabel()
+    {
+        return Mage::helper('xmlconnect')->__('App Stores');
+    }
+
+    /**
+     * Get columns for submission country
+     *
+     * @return int
+     */
+    public function getCountryColumns()
+    {
+        return Mage_XmlConnect_Helper_Iphone::SUBMISSION_COUNTRY_COLUMNS;
+    }
+
+    /**
+     * Get placement of Country Names for submission country
+     *
+     * @return bool
+     */
+    public function isCountryNamePlaceLeft()
+    {
+        return true;
+    }
+
+    /**
+     * Get class name for submission country
+     *
+     * @return string
+     */
+    public function getCountryClass()
+    {
+        return Mage_XmlConnect_Helper_Iphone::SUBMISSION_COUNTRY_RENDERER . ' stripy';
+    }
+
+    /**
+     * Check image fields
+     *
+     * We set empty value for image field if file was missed in some reason
+     *
+     * @param array $data
+     * @return array
+     */
+    public function checkImages(array $data)
+    {
+        if (isset($data['conf']['native']['navigationBar']['icon']) &&
+            !file_exists($data['conf']['native']['navigationBar']['icon'])
+        ) {
+            $data['conf']['native']['navigationBar']['icon'] = '';
+        }
+
+        if (isset($data['conf']['native']['body']['bannerIpadImage']) &&
+            !file_exists($data['conf']['native']['body']['bannerIpadImage'])
+        ) {
+            $data['conf']['native']['body']['bannerIpadImage'] = '';
+        }
+
+        if (isset($data['conf']['native']['body']['backgroundIpadLandscapeImage']) &&
+            !file_exists($data['conf']['native']['body']['backgroundIpadLandscapeImage'])
+        ) {
+            $data['conf']['native']['body']['backgroundIpadLandscapeImage'] = '';
+        }
+        if (isset($data['conf']['native']['body']['backgroundIpadPortraitImage']) &&
+            !file_exists($data['conf']['native']['body']['backgroundIpadPortraitImage'])
+        ) {
+            $data['conf']['native']['body']['backgroundIpadPortraitImage'] = '';
+        }
+        return $data;
+    }
+
+    /**
+     * Check required fields of a config for a front-end
+     *
+     * @throws Mage_Core_Exception
+     * @param array $data
+     * @return void
+     */
+    public function checkRequiredConfigFields($data)
+    {
+        if (!is_array($data)) {
+            return;
+        }
+
+        if (isset($data['navigationBar']['icon'])
+            && empty($data['navigationBar']['icon'])
+        ) {
+            Mage::throwException(
+                Mage::helper('xmlconnect')->__('Logo in Header image missing.')
+            );
+        }
+        if (isset($data['body']['bannerIpadImage'])
+            && empty($data['body']['bannerIpadImage'])
+        ) {
+            Mage::throwException(
+                Mage::helper('xmlconnect')->__('Banner on Home Screen image missing.')
+            );
+        }
+        if (isset($data['body']['backgroundIpadLandscapeImage'])
+            && empty($data['body']['backgroundIpadLandscapeImage'])
+        ) {
+            Mage::throwException(
+                Mage::helper('xmlconnect')->__('App Background (landscape mode).')
+            );
+        }
+        if (isset($data['body']['backgroundIpadPortraitImage'])
+            && empty($data['body']['backgroundIpadPortraitImage'])
+        ) {
+            Mage::throwException(
+                Mage::helper('xmlconnect')->__('App Background (portrait mode).')
+            );
+        }
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Helper/Iphone.php b/app/code/core/Mage/XmlConnect/Helper/Iphone.php
index e3e93d81f4..810a9d38f0 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Iphone.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Iphone.php
@@ -24,8 +24,58 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+/**
+ * XmlConnect device helper for iPhone
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
 class Mage_XmlConnect_Helper_Iphone extends Mage_Core_Helper_Abstract
 {
+    /**
+     * Submission title length
+     *
+     * @var int
+     */
+    const SUBMISSION_TITLE_LENGTH = 12;
+
+    /**
+     * Submission description length
+     *
+     * @var int
+     */
+    const SUBMISSION_DESCRIPTION_LENGTH = 500;
+
+    /**
+     * Country renderer for submission page
+     *
+     * @var string
+     */
+    const SUBMISSION_COUNTRY_RENDERER = 'istore';
+
+    /**
+     * Country columns for submission page
+     *
+     * @var int
+     */
+    const SUBMISSION_COUNTRY_COLUMNS = 4;
+
+    /**
+     * Submit images that are stored in "params" field of history table
+     *
+     * @var array
+     */
+    protected $_imageIds = array(
+        'icon',
+        'loader_image',
+        'loader_image_i4',
+        'logo',
+        'logo_i4',
+        'big_logo',
+        'big_logo_i4'
+    );
+
     /**
      * List of coutries that allowed in Ituens by Apple Store
      *
@@ -35,7 +85,7 @@ class Mage_XmlConnect_Helper_Iphone extends Mage_Core_Helper_Abstract
      *
      * @var array
      */
-    protected $_allowedCounrties = array(
+    protected $_allowedCountries = array(
                 'Argentina' => 'AR',
                 'Armenia' => 'AM',
                 'Australia' => 'AU',
@@ -77,7 +127,7 @@ class Mage_XmlConnect_Helper_Iphone extends Mage_Core_Helper_Abstract
                 'Kenya' => 'KE',
                 'South Korea' => 'KR',
                 'Kuwait' => 'KW',
-                'Latvia' => 'LW',
+                'Latvia' => 'LV',
                 'Lebanon' => 'LB',
                 'Lithuania' => 'LT',
                 'Luxembourg' => 'LU',
@@ -126,7 +176,24 @@ class Mage_XmlConnect_Helper_Iphone extends Mage_Core_Helper_Abstract
                 'Uruguay' => 'UY',
                 'Venezuela' => 'VE',
                 'Vietnam' => 'VN',
-        );
+    );
+
+    /**
+     * Country field renderer
+     *
+     * @var Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Renderer_Country_Istore
+     */
+    protected $_countryRenderer = null;
+
+    /**
+     * Get submit images that are required for application submit
+     *
+     * @return array
+     */
+    public function getSubmitImages()
+    {
+        return $this->_imageIds;
+    }
 
     /**
      * Get default application tabs
@@ -492,12 +559,233 @@ public function getFontSizes()
     }
 
     /**
-     * Get list of coutries that allowed in Ituens by Apple Store for Iphone
+     * Get list of countries that allowed in Itunes by Apple Store for Iphone
      *
      * @return array
      */
     public function getItunesCountriesArray()
     {
-        return $this->_allowedCounrties;
+        return $this->_allowedCountries;
+    }
+
+    /**
+     * Validate submit application data
+     *
+     * @param array $params
+     * @return array
+     */
+    public function validateSubmit($params)
+    {
+        $errors = array();
+
+        if (!Zend_Validate::is(isset($params['title']) ? $params['title'] : null, 'NotEmpty')) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please enter the Title.');
+        }
+
+        if (isset($params['title'])) {
+            $titleLength = self::SUBMISSION_TITLE_LENGTH;
+            $strRules = array('min' => '1', 'max' => $titleLength);
+            if (!Zend_Validate::is($params['title'], 'StringLength', $strRules)) {
+                $errors[] = Mage::helper('xmlconnect')->__('"Title" is more than %d characters long', $strRules['max']);
+            }
+        }
+
+        if (!Zend_Validate::is(isset($params['description']) ? $params['description'] : null, 'NotEmpty')) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please enter the Description.');
+        }
+
+        if (isset($params['description'])) {
+            $descriptionLength = self::SUBMISSION_DESCRIPTION_LENGTH;
+            $strRules = array('min' => '1', 'max' => $descriptionLength);
+            if (!Zend_Validate::is($params['title'], 'StringLength', $strRules)) {
+                $errors[] = Mage::helper('xmlconnect')->__('"Description" is more than %d characters long', $strRules['max']);
+            }
+        }
+
+        if (!Zend_Validate::is(isset($params['copyright']) ? $params['copyright'] : null, 'NotEmpty')) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please enter the Copyright.');
+        }
+
+        if (empty($params['price_free'])) {
+            if (!Zend_Validate::is(isset($params['price']) ? $params['price'] : null, 'NotEmpty')) {
+                $errors[] = Mage::helper('xmlconnect')->__('Please enter the Price.');
+            }
+        }
+
+        if (!Zend_Validate::is(isset($params['country']) ? $params['country'] : null, 'NotEmpty')) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please select at least one country.');
+        }
+
+        $keyLenght = Mage_XmlConnect_Model_Application::APP_MAX_KEY_LENGTH;
+        if (Mage::helper('xmlconnect')->getApplication()->getIsResubmitAction()) {
+            if (isset($params['resubmission_activation_key'])) {
+                $resubmissionKey = $params['resubmission_activation_key'];
+            } else {
+                $resubmissionKey = null;
+            }
+
+            if (!Zend_Validate::is($resubmissionKey, 'NotEmpty')) {
+                $errors[] = Mage::helper('xmlconnect')->__('Please enter the Resubmission Key.');
+            } else if (!Zend_Validate::is($resubmissionKey, 'StringLength', array(1, $keyLenght))) {
+                $errors[] = Mage::helper('xmlconnect')->__('Submit App failure. Invalid activation key provided');
+            }
+        } else {
+            $key = isset($params['key']) ? $params['key'] : null;
+            if (!Zend_Validate::is($key, 'NotEmpty')) {
+                $errors[] = Mage::helper('xmlconnect')->__('Please enter the Activation Key.');
+            } else if (!Zend_Validate::is($key, 'StringLength', array(1, $keyLenght))) {
+                $errors[] = Mage::helper('xmlconnect')->__('Submit App failure. Invalid activation key provided');
+            }
+        }
+        return $errors;
+    }
+
+    /**
+     * Check config for valid values
+     *
+     * @param array $native
+     * @return array
+     */
+    public function validateConfig($native)
+    {
+        $errors = array();
+
+        if ( ($native === false)
+            || (!isset($native['navigationBar']) || !is_array($native['navigationBar'])
+            || !isset($native['navigationBar']['icon'])
+            || !Zend_Validate::is($native['navigationBar']['icon'], 'NotEmpty'))) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "Logo in Header" field from Design Tab.');
+        }
+
+        if (!Mage::helper('xmlconnect')->validateConfFieldNotEmpty('bannerImage', $native)) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "Banner on Home Screen" field from Design Tab.');
+        }
+
+        if (!Mage::helper('xmlconnect')->validateConfFieldNotEmpty('backgroundImage', $native)) {
+            $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "App Background" field from Design Tab.');
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Get renderer for submission country
+     *
+     * @return Mage_XmlConnect_Block_Adminhtml_Mobile_Submission_Renderer_Country_Istore
+     */
+    public function getCountryRenderer()
+    {
+        if (empty($this->_countryRenderer)) {
+            $renderer = 'xmlconnect/adminhtml_mobile_submission_renderer_country_'
+                . self::SUBMISSION_COUNTRY_RENDERER;
+            $this->_countryRenderer = Mage::app()->getLayout()->createBlock($renderer);
+        }
+        return $this->_countryRenderer;
+    }
+
+    /**
+     * Get label for submission country
+     *
+     * @return string
+     */
+    public function getCountryLabel()
+    {
+        return Mage::helper('xmlconnect')->__('App Stores');
+    }
+
+    /**
+     * Get columns for submission country
+     *
+     * @return int
+     */
+    public function getCountryColumns()
+    {
+        return self::SUBMISSION_COUNTRY_COLUMNS;
+    }
+
+    /**
+     * Get placement of Country Names for submission country
+     *
+     * @return bool
+     */
+    public function isCountryNamePlaceLeft()
+    {
+        return true;
+    }
+
+    /**
+     * Get class name for submission country
+     *
+     * @return string
+     */
+    public function getCountryClass()
+    {
+        return self::SUBMISSION_COUNTRY_RENDERER . ' stripy';
+    }
+
+    /**
+     * Check image fields
+     *
+     * We set empty value for image field if file was missed in some reason
+     *
+     * @param array $data
+     * @return array
+     */
+    public function checkImages(array $data)
+    {
+        if (isset($data['conf']['native']['navigationBar']['icon']) &&
+            !file_exists($data['conf']['native']['navigationBar']['icon'])
+        ) {
+            $data['conf']['native']['navigationBar']['icon'] = '';
+        }
+
+        if (isset($data['conf']['native']['body']['bannerImage']) &&
+            !file_exists($data['conf']['native']['body']['bannerImage'])
+        ) {
+            $data['conf']['native']['body']['bannerImage'] = '';
+        }
+
+        if (isset($data['conf']['native']['body']['backgroundImage']) &&
+            !file_exists($data['conf']['native']['body']['backgroundImage'])
+        ) {
+            $data['conf']['native']['body']['backgroundImage'] = '';
+        }
+        return $data;
+    }
+
+    /**
+     * Check required fields of a config for a front-end
+     *
+     * @throws Mage_Core_Exception
+     * @param array $data
+     * @return void
+     */
+    public function checkRequiredConfigFields($data)
+    {
+        if (!is_array($data)) {
+            return;
+        }
+
+        if (isset($data['navigationBar']['icon'])
+            && empty($data['navigationBar']['icon'])
+        ) {
+            Mage::throwException(
+                Mage::helper('xmlconnect')->__('Logo in Header image missing.')
+            );
+        }
+        if (isset($data['body']['bannerImage']) &&
+            empty($data['body']['bannerImage'])
+        ) {
+            Mage::throwException(
+                Mage::helper('xmlconnect')->__('Banner on Home Screen image missing.')
+            );
+        }
+        if (isset($data['body']['backgroundImage'])
+            && empty($data['body']['backgroundImage'])
+        ) {
+            Mage::throwException(
+                Mage::helper('xmlconnect')->__('App Background image missing.')
+            );
+        }
     }
 }
diff --git a/app/code/core/Mage/XmlConnect/Helper/Theme.php b/app/code/core/Mage/XmlConnect/Helper/Theme.php
index 2b6aad8988..10b8e64c1b 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Theme.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Theme.php
@@ -41,20 +41,32 @@ class Mage_XmlConnect_Helper_Theme extends Mage_Adminhtml_Helper_Data
     public function getThemeAjaxParameters()
     {
         $themesArray = array (
-            'conf_native_navigationBar_tintColor' => 'conf[native][navigationBar][tintColor]',
-            'conf_native_body_primaryColor' => 'conf[native][body][primaryColor]',
-            'conf_native_body_secondaryColor' => 'conf[native][body][secondaryColor]',
-            'conf_native_categoryItem_backgroundColor' => 'conf[native][categoryItem][backgroundColor]',
-            'conf_native_categoryItem_tintColor' => 'conf[native][categoryItem][tintColor]',
-
-            'conf_extra_fontColors_header' => 'conf[extra][fontColors][header]',
-            'conf_extra_fontColors_primary' => 'conf[extra][fontColors][primary]',
-            'conf_extra_fontColors_secondary' => 'conf[extra][fontColors][secondary]',
-            'conf_extra_fontColors_price' => 'conf[extra][fontColors][price]',
-
-            'conf_native_body_backgroundColor' => 'conf[native][body][backgroundColor]',
-            'conf_native_body_scrollBackgroundColor' => 'conf[native][body][scrollBackgroundColor]',
-            'conf_native_itemActions_relatedProductBackgroundColor' => 'conf[native][itemActions][relatedProductBackgroundColor]'
+            'conf_native_navigationBar_tintColor'
+                => 'conf[native][navigationBar][tintColor]',
+            'conf_native_body_primaryColor'
+                => 'conf[native][body][primaryColor]',
+            'conf_native_body_secondaryColor'
+                => 'conf[native][body][secondaryColor]',
+            'conf_native_categoryItem_backgroundColor'
+                => 'conf[native][categoryItem][backgroundColor]',
+            'conf_native_categoryItem_tintColor'
+                => 'conf[native][categoryItem][tintColor]',
+
+            'conf_extra_fontColors_header'
+                => 'conf[extra][fontColors][header]',
+            'conf_extra_fontColors_primary'
+                => 'conf[extra][fontColors][primary]',
+            'conf_extra_fontColors_secondary'
+                => 'conf[extra][fontColors][secondary]',
+            'conf_extra_fontColors_price'
+                => 'conf[extra][fontColors][price]',
+
+            'conf_native_body_backgroundColor'
+                => 'conf[native][body][backgroundColor]',
+            'conf_native_body_scrollBackgroundColor'
+                => 'conf[native][body][scrollBackgroundColor]',
+            'conf_native_itemActions_relatedProductBackgroundColor'
+                => 'conf[native][itemActions][relatedProductBackgroundColor]'
         );
         return $themesArray;
     }
@@ -76,9 +88,9 @@ public function getAllThemesArray($flushCache = false)
     }
 
     /**
-     *  Reads directory media/xmlconnect/themes/*
+     * Reads directory media/xmlconnect/themes/*
      *
-     * @param bool $flushCache  - Reads default color Themes
+     * @param bool $flushCache Reads default color Themes
      * @return array - (of Mage_XmlConnect_Model_Theme)
      */
     public function getAllThemes($flushCache = false)
@@ -90,33 +102,38 @@ public function getAllThemes($flushCache = false)
             $io = new Varien_Io_File();
             $io->open(array('path' => $themeDir));
 
-            $fileList = $io->ls(Varien_Io_File::GREP_FILES);
-            foreach ($fileList as $file) {
-                $src = $themeDir . DS . $file['text'];
-                if (is_readable($src)) {
-                    try {
+            try {
+                $fileList = $io->ls(Varien_Io_File::GREP_FILES);
+                if (!count($fileList)) {
+                    $this->resetTheme();
+                    $this->getAllThemes(true);
+                }
+                foreach ($fileList as $file) {
+                    $src = $themeDir . DS . $file['text'];
+                    if (is_readable($src)) {
                         $theme = Mage::getModel('xmlconnect/theme', $src);
                         $this->_themeArray[$theme->getName()] = $theme;
-                    } catch (Exception $e) {
-                        Mage::logException($e);
                     }
                 }
+                libxml_use_internal_errors($saveLibxmlErrors);
+            } catch (Exception $e) {
+                Mage::logException($e);
             }
-            libxml_use_internal_errors($saveLibxmlErrors);
         }
         return $this->_themeArray;
     }
 
     /**
-     * Reset all theme color changes
-     * Copy media/xmlconnect/themes/default/* to media/xmlconnect/themes/*
+     * Reset themes color changes
+     * Copy /xmlconnect/etc/themes/* to media/xmlconnect/themes/*
      *
+     * @throws Mage_Core_Exception
      * @return void
      */
-    public function resetAllThemes()
+    public function resetTheme($theme = null)
     {
         $themeDir = Mage::getBaseDir('media') . DS . 'xmlconnect' . DS . 'themes';
-        $defaultThemeDir = Mage::getBaseDir('media') . DS . 'xmlconnect' . DS . 'themes' . DS . 'default';
+        $defaultThemeDir = Mage::getModuleDir('etc', 'Mage_XmlConnect') . DS . 'themes';
 
         $io = new Varien_Io_File();
         $io->open(array('path'=>$defaultThemeDir));
@@ -125,16 +142,17 @@ public function resetAllThemes()
             $f = $file['text'];
             $src = $defaultThemeDir . DS . $f;
             $dst = $themeDir . DS .$f;
-            if ($io->isWriteable($dst)) {
-                try {
-                    if (!$io->cp($src, $dst)) {
-                        Mage::throwException(Mage::helper('xmlconnect')->__('Can\t copy file "%s" to "%s".', $src, $dst));
-                    } else {
-                        $io->chmod($dst, 0755);
-                    }
-                } catch (Exception $e) {
-                    Mage::logException($e);
-                }
+
+            if ($theme && ($theme . '.xml') != $f) {
+                continue;
+            }
+
+            if (!$io->cp($src, $dst)) {
+                Mage::throwException(
+                    Mage::helper('xmlconnect')->__('Can\'t copy file "%s" to "%s".', $src, $dst)
+                );
+            } else {
+                $io->chmod($dst, 0755);
             }
         }
     }
@@ -171,4 +189,39 @@ public function getDefaultThemeName()
     {
         return 'default';
     }
+
+    /**
+     * Get current theme name
+     *
+     * @return string
+     */
+    public function getThemeId()
+    {
+        $themeId = Mage::helper('xmlconnect')->getApplication()->getData('conf/extra/theme');
+        if (empty($themeId)) {
+            $themeId = $this->getDefaultThemeName();
+        }
+        return $themeId;
+    }
+
+    /**
+     * Get theme label by theme name
+     *
+     * @param array $themes
+     * @param bool $themeId
+     * @return string
+     */
+    public function getThemeLabel(array $themes, $themeId = false)
+    {
+        $themeLabel = '';
+        $themeId    = $themeId ? $themeId : $this->getThemeId();
+
+        foreach ($themes as $theme) {
+            if ($theme->getName() == $themeId) {
+                $themeLabel = $theme->getLabel();
+                break;
+            }
+        }
+        return $themeLabel;
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Model/Application.php b/app/code/core/Mage/XmlConnect/Model/Application.php
index 7887eef7e4..9a761a3f8b 100644
--- a/app/code/core/Mage/XmlConnect/Model/Application.php
+++ b/app/code/core/Mage/XmlConnect/Model/Application.php
@@ -102,13 +102,6 @@ class Mage_XmlConnect_Model_Application extends Mage_Core_Model_Abstract
      */
     const APP_PREFIX_CUT_LENGTH = 3;
 
-    /**
-     * Images in "Params" history table
-     *
-     * @var array
-     */
-    protected $_imageIds = array('icon', 'loader_image', 'logo', 'big_logo');
-
     /**
      * Last submitted data from history table
      *
@@ -144,6 +137,22 @@ class Mage_XmlConnect_Model_Application extends Mage_Core_Model_Abstract
      */
     protected $conf;
 
+    /**
+     * Social networking validation array
+     *
+     * Social networking validation array specified as
+     *      array (
+     *          network id => API key string length
+     *      )
+     *
+     * @var array
+     */
+    protected $_socialNetValidationArray = array(
+        Mage_XmlConnect_Helper_Data::SOCIAL_NETWORK_TWITTER,
+        Mage_XmlConnect_Helper_Data::SOCIAL_NETWORK_FACEBOOK,
+        Mage_XmlConnect_Helper_Data::SOCIAL_NETWORK_LINKEDIN,
+    );
+
     /**
      * Submission/Resubmission key max length
      *
@@ -190,6 +199,26 @@ class Mage_XmlConnect_Model_Application extends Mage_Core_Model_Abstract
      */
     const XML_PATH_GENERAL_RESTRICTION_MODE = 'general/restriction/mode';
 
+    /**
+     * XML path to config secure base link URL
+     *
+     * @var string
+     */
+    const XML_PATH_SECURE_BASE_LINK_URL = 'web/secure/base_link_url';
+
+    /**
+     * XML path to config for paypal business account
+     *
+     * @var string
+     */
+    const XML_PATH_PAYPAL_BUSINESS_ACCOUNT = 'paypal/general/business_account';
+
+    /**
+     * XML path to config for default cache time
+     *
+     * @var string
+     */
+    const XML_PATH_DEFAULT_CACHE_LIFETIME = 'xmlconnect/mobile_application/cache_lifetime';
 
     /**
      * Initialize application
@@ -220,6 +249,7 @@ public function getIsSubmitted()
     public function getFormData()
     {
         $data = $this->getData();
+        $data = Mage::helper('xmlconnect')->getDeviceHelper()->checkImages($data);
         return $this->_flatArray($data);
     }
 
@@ -360,28 +390,41 @@ public function getRenderConf()
                 }
             }
         }
+        /** @var $helperImage Mage_XmlConnect_Helper_Image */
         $helperImage = Mage::helper('xmlconnect/image');
-        $screenSize = $this->getScreenSize();
         $paths = $helperImage->getInterfaceImagesPathsConf();
         foreach ($paths as $confPath => $dataPath) {
             $imageNodeValue =& $helperImage->findPath($result, $dataPath);
             if ($imageNodeValue) {
-                /**
-                 * Creating file ending (some_inner/some_dir/filename.png) For url
-                 */
-                $imageNodeValue = $helperImage->getFileCustomDirSuffixAsUrl($confPath, $imageNodeValue);
+                if (!file_exists($imageNodeValue)) {
+                    /**
+                     * We set empty string to get default image if original was missing in some reason
+                     */
+                    $imageNodeValue = '';
+                } else {
+                    /**
+                     * Creating file ending (some_inner/some_dir/filename.png) For url
+                     */
+                    $imageNodeValue = $helperImage->getFileCustomDirSuffixAsUrl($confPath, $imageNodeValue);
+                }
             }
         }
         $result = $this->_absPath($result);
+
         /**
          * General configuration
+	 $resulI = $this->_absPath($result);
          */
         $result['general']['updateTimeUTC'] = strtotime($this->getUpdatedAt());
         $result['general']['browsingMode'] = $this->getBrowsingMode();
         $result['general']['currencyCode'] = Mage::app()->getStore($this->getStoreId())->getDefaultCurrencyCode();
-        $result['general']['secureBaseUrl'] = Mage::getStoreConfig(Mage_Core_Model_Store::XML_PATH_SECURE_BASE_URL, $this->getStoreId());
-        $maxRecipients = 0;
-        $allowGuest = 0;
+        $result['general']['secureBaseUrl'] = Mage::getStoreConfig(
+            self::XML_PATH_SECURE_BASE_LINK_URL,
+            $this->getStoreId()
+        );
+
+        $maxRecipients  = 0;
+        $allowGuest     = 0;
         if (Mage::getStoreConfig(Mage_Sendfriend_Helper_Data::XML_PATH_ENABLED)) {
             $maxRecipients = Mage::getStoreConfig(Mage_Sendfriend_Helper_Data::XML_PATH_MAX_RECIPIENTS);
             $allowGuest = Mage::getStoreConfig(Mage_Sendfriend_Helper_Data::XML_PATH_ALLOW_FOR_GUEST);
@@ -391,17 +434,39 @@ public function getRenderConf()
         $result['general']['primaryStoreLang'] = Mage::app()
             ->getStore($this->getStoreId())->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_LOCALE);
         $result['general']['magentoVersion'] = Mage::getVersion();
-        $result['general']['copyright'] = Mage::getStoreConfig(self::XML_PATH_DESIGN_FOOTER_COPYRIGHT, $this->getStoreId());
+        $result['general']['copyright'] = Mage::getStoreConfig(
+            self::XML_PATH_DESIGN_FOOTER_COPYRIGHT,
+            $this->getStoreId()
+        );
 
         $result['general']['isAllowedGuestCheckout'] = Mage::getSingleton('checkout/session')
             ->getQuote()->isAllowedGuestCheckout();
 
-        if (!Mage::getStoreConfigFlag('wishlist/general/active')) {
-            $result['general']['wishlistEnable'] = '0';
+        /**
+         * Check is guest can post product reviews
+         */
+        if (Mage::helper('review')->getIsGuestAllowToWrite()) {
+            $result['general']['isAllowedGuestReview'] = '1';
         } else {
+            $result['general']['isAllowedGuestReview'] = '0';
+        }
+
+        /**
+        * Check is wishlist enabled in a config
+        */
+        if (Mage::getStoreConfigFlag('wishlist/general/active')) {
             $result['general']['wishlistEnable'] = '1';
+        } else {
+            $result['general']['wishlistEnable'] = '0';
         }
 
+        /**
+         * "Use Secure URLs in Frontend" flag
+         */
+        $result['general']['useSecureURLInFrontend'] = (int)Mage::getStoreConfigFlag(
+            Mage_Core_Model_Store::XML_PATH_SECURE_IN_FRONTEND
+        );
+
         /**
          * PayPal configuration
          */
@@ -410,12 +475,15 @@ public function getRenderConf()
 
         $isActive = 0;
         if (isset($result['paypal']) && isset($result['paypal']['isActive'])) {
-            $isActive = (int)($result['paypal']['isActive'] && Mage::getModel('xmlconnect/payment_method_paypal_mep')->isAvailable(null));
+            $paypalMep = Mage::getModel('xmlconnect/payment_method_paypal_mep');
+            $isActive = (int)($result['paypal']['isActive'] && $paypalMep->isAvailable(null));
         }
         $result['paypal']['isActive'] = $isActive;
 
         if ((int)Mage::getStoreConfig(self::XML_PATH_GENERAL_RESTRICTION_IS_ACTIVE)) {
-            $result['website_restrictions']['mode'] = (int) Mage::getStoreConfig(self::XML_PATH_GENERAL_RESTRICTION_MODE);
+            $result['website_restrictions']['mode'] = (int)Mage::getStoreConfig(
+                self::XML_PATH_GENERAL_RESTRICTION_MODE
+            );
         }
 
         return $result;
@@ -560,7 +628,11 @@ public function loadSubmit()
                     $conf['submit_restore'] = array();
                 }
                 foreach ($params as $id => $value) {
-                    if (!in_array($id, $this->_imageIds)) {
+                    $deviceImages = Mage::helper('xmlconnect')
+                        ->getDeviceHelper()
+                        ->getSubmitImages();
+
+                    if (!in_array($id, $deviceImages)) {
                         $conf['submit_text'][$id] = $value;
                     } else {
                         $conf['submit_restore'][$id] = $value;
@@ -582,8 +654,11 @@ public function getImages()
     {
         $images = array();
         $params = $this->getLastParams();
+        $deviceImages = Mage::helper('xmlconnect')
+            ->getDeviceHelper()
+            ->getSubmitImages();
 
-        foreach ($this->_imageIds as $id) {
+        foreach ($deviceImages as $id) {
             $path = $this->getData('conf/submit/'.$id);
             $basename = null;
             if (!empty($path)) {
@@ -595,9 +670,9 @@ public function getImages()
                /**
                 * Fetching data from submission history table record
                 *
-                * converting :  "@\var\somedir\media\xmlconnect\form_icon_6.png" to "\var\somedir\media\xmlconnect\forn_icon_6.png"
+                * converting :  "@\var\somedir\media\xmlconnect\form_icon_6.png"
+                * to "\var\somedir\media\xmlconnect\forn_icon_6.png"
                 */
-//                $path = substr($params[$id], 1);
                 $basename = basename($params[$id]);
             }
             if (!empty($basename)) {
@@ -634,6 +709,7 @@ public function validate()
         if ($validateConf !== true) {
             $errors = $validateConf;
         }
+
         if (!Zend_Validate::is($this->getName(), 'NotEmpty')) {
             $errors[] = Mage::helper('xmlconnect')->__('Please enter "App Title".');
         }
@@ -657,51 +733,12 @@ public function validateSubmit($params)
         if ($validateConf !== true) {
             $errors = $validateConf;
         }
-        if (!Zend_Validate::is(isset($params['title']) ? $params['title'] : null, 'NotEmpty')) {
-            $errors[] = Mage::helper('xmlconnect')->__('Please enter the Title.');
-        }
-
-        if (isset($params['title'])) {
-            if ($this->getType() == Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE) {
-                $strRules = array('max' => '12');
-            } else {
-                $strRules = array('max' => '200');
-            }
-            if (!Zend_Validate::is($params['title'], 'StringLength', $strRules)) {
-                $errors[] = Mage::helper('xmlconnect')->__('"Title" is more than %d characters long', $strRules['max']);
-            }
-        }
-
-        if (!Zend_Validate::is(isset($params['copyright']) ? $params['copyright'] : null, 'NotEmpty')) {
-            $errors[] = Mage::helper('xmlconnect')->__('Please enter the Copyright.');
-        }
-
-        if (empty($params['price_free'])) {
-            if (!Zend_Validate::is(isset($params['price']) ? $params['price'] : null, 'NotEmpty')) {
-                $errors[] = Mage::helper('xmlconnect')->__('Please enter the Price.');
-            }
-        }
 
-        if (!Zend_Validate::is(isset($params['country']) ? $params['country'] : null, 'NotEmpty')) {
-            $errors[] = Mage::helper('xmlconnect')->__('Please select at least one country.');
-        }
+        $submitErrors = Mage::helper('xmlconnect')->getDeviceHelper($this)->validateSubmit($params);
 
-        if ($this->getIsResubmitAction()) {
-            $resubmissionKey = isset($params['resubmission_activation_key']) ? $params['resubmission_activation_key'] : null;
-            if (!Zend_Validate::is($resubmissionKey, 'NotEmpty')) {
-                $errors[] = Mage::helper('xmlconnect')->__('Please enter the Resubmission Key.');
-            } else if (!Zend_Validate::is($resubmissionKey, 'StringLength', array(1, self::APP_MAX_KEY_LENGTH))) {
-                $errors[] = Mage::helper('xmlconnect')->__('Submit App failure. Invalid activation key provided');
-            }
-        } else {
-            $key = isset($params['key']) ? $params['key'] : null;
-            if (!Zend_Validate::is($key, 'NotEmpty')) {
-                $errors[] = Mage::helper('xmlconnect')->__('Please enter the Activation Key.');
-            } else if (!Zend_Validate::is($key, 'StringLength', array(1, self::APP_MAX_KEY_LENGTH))) {
-                $errors[] = Mage::helper('xmlconnect')->__('Submit App failure. Invalid activation key provided');
-            }
+        if (count($submitErrors)) {
+            $errors = array_merge($errors, $submitErrors);
         }
-
         if (empty($errors)) {
             return true;
         }
@@ -711,62 +748,39 @@ public function validateSubmit($params)
     /**
      * Check config for valid values
      *
-     * @throws Mage_Core_Exception
      * @return bool|array
      */
     protected function _validateConf()
     {
-        $errors = array();
         $conf = $this->getConf();
         $native = isset($conf['native']) && is_array($conf['native']) ? $conf['native'] : false;
-
-        if ( ($native === false)
-            || (!isset($native['navigationBar']) || !is_array($native['navigationBar'])
-            || !isset($native['navigationBar']['icon'])
-            || !Zend_Validate::is($native['navigationBar']['icon'], 'NotEmpty'))) {
-            $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "Logo in Header" field from Design Tab.');
-        }
-
-        $deviceType = Mage::helper('xmlconnect')->getApplication()->getType();
-        switch ($deviceType) {
-            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPHONE:
-                if (!Mage::helper('xmlconnect')->validateConfFieldNotEmpty('bannerImage', $native)) {
-                    $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "Banner on Home Screen" field from Design Tab.');
-                }
-
-                if (!Mage::helper('xmlconnect')->validateConfFieldNotEmpty('backgroundImage', $native)) {
-                    $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "App Background" field from Design Tab.');
-                }
-                break;
-            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_IPAD:
-                if (!Mage::helper('xmlconnect')->validateConfFieldNotEmpty('bannerIpadImage', $native)) {
-                    $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "Banner on Home Screen" field from Design Tab.');
-                }
-
-                if (!Mage::helper('xmlconnect')->validateConfFieldNotEmpty('backgroundIpadLandscapeImage', $native)) {
-                    $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "App Background (landscape mode)" field from Design Tab.');
-                }
-
-                if (!Mage::helper('xmlconnect')->validateConfFieldNotEmpty('backgroundIpadPortraitImage', $native)) {
-                    $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "App Background (portrait mode)" field from Design Tab.');
-                }
-                break;
-            case Mage_XmlConnect_Helper_Data::DEVICE_TYPE_ANDROID:
-                if (!Mage::helper('xmlconnect')->validateConfFieldNotEmpty('bannerAndroidImage', $native)) {
-                    $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "Banner on Home Screen" field from Design Tab.');
-                }
-
-                if (!Mage::helper('xmlconnect')->validateConfFieldNotEmpty('backgroundAndroidLandscapeImage', $native)) {
-                    $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "App Background (landscape mode)" field from Design Tab.');
-                }
-
-                if (!Mage::helper('xmlconnect')->validateConfFieldNotEmpty('backgroundAndroidPortraitImage', $native)) {
-                    $errors[] = Mage::helper('xmlconnect')->__('Please upload  an image for "App Background (portrait mode)" field from Design Tab.');
+        $errors = Mage::helper('xmlconnect')->getDeviceHelper($this)->validateConfig($native);
+
+        foreach ($this->_socialNetValidationArray as $networkKey) {
+            if (isset($native['socialNetworking'][$networkKey]['isActive'])
+                && $native['socialNetworking'][$networkKey]['isActive']
+            ) {
+                if ($networkKey !== Mage_XmlConnect_Helper_Data::SOCIAL_NETWORK_FACEBOOK) {
+                    $networkName = ucfirst($networkKey);
+                    if (!isset($native['socialNetworking'][$networkKey]['apiKey'])
+                        || !Zend_Validate::is($native['socialNetworking'][$networkKey]['apiKey'], 'NotEmpty')
+                    ) {
+                        $errors[] = Mage::helper('xmlconnect')->__('%s API Key required.', $networkName);
+                    }
+                    if (!isset($native['socialNetworking'][$networkKey]['secretKey'])
+                        || !Zend_Validate::is($native['socialNetworking'][$networkKey]['secretKey'], 'NotEmpty')
+                    ) {
+                        $errors[] = Mage::helper('xmlconnect')->__('%s Secret Key required.', $networkName);
+                    }
+                } else {
+                    $networkName = ucfirst($networkKey);
+                    if (!isset($native['socialNetworking'][$networkKey]['appID'])
+                        || !Zend_Validate::is($native['socialNetworking'][$networkKey]['appID'], 'NotEmpty')
+                    ) {
+                        $errors[] = Mage::helper('xmlconnect')->__('%s Application ID required.', $networkName);
+                    }
                 }
-                break;
-            default:
-                Mage::throwException(Mage::helper('xmlconnect')->__('Device doesn\'t recognized: "%s". Unable to load a helper.', $deviceType));
-                break;
+            }
         }
 
         if (empty($errors)) {
@@ -825,7 +839,11 @@ public function prepareSubmitParams($data)
                 $submitRestore = $this->_data['conf']['submit_restore'];
             }
 
-            foreach ($this->_imageIds as $id) {
+            $deviceImages = Mage::helper('xmlconnect')
+                ->getDeviceHelper()
+                ->getSubmitImages();
+
+            foreach ($deviceImages as $id) {
                 if (isset($submit[$id])) {
                     $params[$id] = '@' . $submit[$id];
                 } else if (isset($submitRestore[$id])) {
@@ -916,4 +934,15 @@ public function getAppMasterSecret()
     {
         return $this->getData('conf/native/notifications/applicationMasterSecret');
     }
+
+    /**
+     * Getter for Application Cache Lifetime
+     *
+     * @return int|string
+     */
+    public function getCacheLifetime()
+    {
+        $lifetime = (int)$this->loadConfiguration()->getData('conf/native/cacheLifetime');
+        return $lifetime <= 0 ? '' : $lifetime;
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Model/Observer.php b/app/code/core/Mage/XmlConnect/Model/Observer.php
index 0955974c0b..d6dda20da1 100644
--- a/app/code/core/Mage/XmlConnect/Model/Observer.php
+++ b/app/code/core/Mage/XmlConnect/Model/Observer.php
@@ -37,11 +37,15 @@ class Mage_XmlConnect_Model_Observer
      * @var array
      */
     protected $_appDependOnConfigFieldPathes = array(
-        'paypal/general/business_account',
+        Mage_XmlConnect_Model_Application::XML_PATH_PAYPAL_BUSINESS_ACCOUNT,
         'sendfriend/email/max_recipients',
         'sendfriend/email/allow_guest',
         'general/locale/code',
-        'currency/options/default'
+        'currency/options/default',
+        Mage_XmlConnect_Model_Application::XML_PATH_SECURE_BASE_LINK_URL,
+        Mage_XmlConnect_Model_Application::XML_PATH_GENERAL_RESTRICTION_IS_ACTIVE,
+        Mage_XmlConnect_Model_Application::XML_PATH_GENERAL_RESTRICTION_MODE,
+        Mage_XmlConnect_Model_Application::XML_PATH_DEFAULT_CACHE_LIFETIME
     );
 
     /**
diff --git a/app/code/core/Mage/XmlConnect/Model/Paypal/Mep/Checkout.php b/app/code/core/Mage/XmlConnect/Model/Paypal/Mep/Checkout.php
index 92cb6de107..e7b87cd03c 100644
--- a/app/code/core/Mage/XmlConnect/Model/Paypal/Mep/Checkout.php
+++ b/app/code/core/Mage/XmlConnect/Model/Paypal/Mep/Checkout.php
@@ -27,16 +27,21 @@
 /**
  * Wrapper that performs Paypal MEP and Checkout communication
  *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Mage_XmlConnect_Model_Paypal_Mep_Checkout
 {
-    /**
+    /**#@+
      * Keys for passthrough variables in sales/quote_payment and sales/order_payment
      * Uses additional_information as storage
+     *
      * @var string
      */
     const PAYMENT_INFO_PAYER_EMAIL = 'paypal_payer_email';
     const PAYMENT_INFO_TRANSACTION_ID = 'paypal_mep_checkout_transaction_id';
+    /**#@-*/
 
     /**
      * Payment method type
@@ -46,16 +51,22 @@ class Mage_XmlConnect_Model_Paypal_Mep_Checkout
     protected $_methodType = Mage_XmlConnect_Model_Payment_Method_Paypal_Mep::MEP_METHOD_CODE;
 
     /**
+     * Quote model
+     *
      * @var Mage_Sales_Model_Quote
      */
     protected $_quote = null;
 
     /**
+     * Checkout session model
+     *
      * @var Mage_Checkout_Model_Session
      */
     protected $_checkoutSession;
 
     /**
+     * XmlConnect default helper
+     *
      * @var Mage_XmlConnect_Helper_Data
      */
     protected $_helper;
@@ -79,7 +90,7 @@ public function __construct($params = array())
 
     /**
      * Prepare quote, reserve order ID for specified quote
-     * 
+     *
      * @return string
      */
     public function initCheckout()
@@ -123,24 +134,25 @@ public function saveShipping($data)
         }
 
         $address = $this->_quote->getBillingAddress();
-        /**
-         * Start hard code data
-         *
-         * @todo remove this hard code
-         */
-        $data['country_id'] = 'US';
-        if (Mage::getSingleton('customer/session')->isLoggedIn()) {
-            $customer = Mage::getSingleton('customer/session')->getCustomer();
-            $data['firstname'] = $customer->getFirstname();
-            $data['lastname'] = $customer->getLastname();
 
-        } else {
-            $data['firstname'] = Mage::helper('xmlconnect')->__('Guest');
-            $data['lastname'] = Mage::helper('xmlconnect')->__('Guest');
+        $this->_applyCountryWorkarounds($data);
+        if (!in_array($data['country_id'], Mage::getModel('paypal/config')->getSupportedBuyerCountryCodes())) {
+            return array(
+                'error' => 1,
+                'message' => Mage::helper('xmlconnect')->__('Buyer country is not allowed by store.')
+            );
+        }
+
+        if (empty($data['firstname']) && empty($data['lastname'])) {
+            if (Mage::getSingleton('customer/session')->isLoggedIn()) {
+                $customer = Mage::getSingleton('customer/session')->getCustomer();
+                $data['firstname'] = $customer->getFirstname();
+                $data['lastname'] = $customer->getLastname();
+            } else {
+                $data['firstname'] = Mage::helper('xmlconnect')->__('Guest');
+                $data['lastname'] = Mage::helper('xmlconnect')->__('Guest');
+            }
         }
-        /**
-         * End hard code
-         */
 
         $address->addData($data);
 
@@ -211,7 +223,10 @@ public function savePayment($data)
 
         $email = isset($data['payer']) ? $data['payer'] : null;
         $payment->setAdditionalInformation(self::PAYMENT_INFO_PAYER_EMAIL, $email);
-        $payment->setAdditionalInformation(self::PAYMENT_INFO_TRANSACTION_ID, isset($data['transaction_id']) ? $data['transaction_id'] : null);
+        $payment->setAdditionalInformation(
+            self::PAYMENT_INFO_TRANSACTION_ID,
+            isset($data['transaction_id']) ? $data['transaction_id'] : null
+        );
         $this->_quote->setCustomerEmail($email);
 
         $this->_quote->collectTotals()->save();
@@ -306,4 +321,20 @@ protected function _prepareGuestQuote()
             ->setCustomerGroupId(Mage_Customer_Model_Group::NOT_LOGGED_IN_ID);
         return $this;
     }
+
+    /**
+     * Adopt specified request array from PayPal
+     *
+     * @param array $request
+     * @return void
+     */
+    protected function _applyCountryWorkarounds(&$request)
+    {
+        $request['country_id'] = isset($request['country_id']) ? trim($request['country_id']) : null;
+        if (empty($request['country_id'])) {
+            $request['country_id'] = strtoupper(Mage::getStoreConfig('general/country/default'));
+        } else {
+            $request['country_id'] = strtoupper($request['country_id']);
+        }
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Model/Preview/Abstract.php b/app/code/core/Mage/XmlConnect/Model/Preview/Abstract.php
new file mode 100755
index 0000000000..86d0239286
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Preview/Abstract.php
@@ -0,0 +1,261 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Device preview model abstract
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+abstract class Mage_XmlConnect_Model_Preview_Abstract extends Varien_Object
+{
+    /**
+     * Current active tab according preview action
+     *
+     * @var bool|string
+     */
+    private $_activeTab = false;
+
+    /**
+     * Category item tint color styles
+     *
+     * @var string
+     */
+    protected $_categoryItemTintColor = '';
+
+    /**
+     * Current loaded application model
+     *
+     * @var Mage_XmlConnect_Model_Application|null
+     */
+    protected $_appModel = null;
+
+    /**
+     * Internal constructor not depended on params.
+     * It's used for application object initialization
+     *
+     * @return void
+     */
+    final function _construct()
+    {
+        parent::_construct();
+        $this->setApplicationModel();
+    }
+
+    /**
+     * Getter for current loaded application model
+     *
+     * @return Mage_XmlConnect_Model_Application
+     */
+    protected function setApplicationModel()
+    {
+        if ($this->_appModel === null) {
+            $this->_appModel = Mage::helper('xmlconnect')->getApplication();
+        }
+        return $this;
+    }
+
+    public function getApplicationModel()
+    {
+        return $this->setApplicationModel()->_appModel;
+    }
+
+    /**
+     * Set active tab
+     *
+     * @param string $tab
+     * @return Mage_XmlConnect_Block_Adminhtml_Mobile_Preview_Tabitems
+     */
+    public function setActiveTab($tab)
+    {
+        $this->_activeTab = $tab;
+        return $this;
+    }
+
+    /**
+     * Check is exists a tab in a config array
+     *
+     * @param string $tabAction tab action name
+     * @return bool
+     */
+    public function isItemExists($tabAction)
+    {
+        $tabs = $this->getTabItems();
+        return (bool) isset($tabs[$tabAction]);
+    }
+
+    /**
+     * Collect tab items array
+     *
+     * @return array
+     */
+    public function getTabItems()
+    {
+        $items = array();
+        $model = $this->getApplicationModel();
+        $tabs = $model->getEnabledTabsArray();
+        $tabLimit = (int) Mage::getStoreConfig('xmlconnect/devices/'.strtolower($model->getType()).'/tab_limit');
+        $showedTabs = 0;
+        foreach ($tabs as $tab) {
+            if (++$showedTabs > $tabLimit) {
+                break;
+            }
+            $items[$tab->action] = array(
+                'label' => Mage::helper('xmlconnect')->getTabLabel($tab->action),
+                'image' => $tab->image,
+                'action' => $tab->action,
+                'active' => strtolower($tab->action) == strtolower($this->_activeTab),
+            );
+        }
+        return $items;
+    }
+
+    /**
+     * Prepare config data
+     * Implement set "conf" data as magic method
+     *
+     * @param array $conf
+     */
+    public function setConf($conf)
+    {
+        if (!is_array($conf)) {
+            $conf = array();
+        }
+        $tabs = isset($conf['tabBar']) && isset($conf['tabBar']['tabs']) ? $conf['tabBar']['tabs'] : false;
+        if ($tabs !== false) {
+            foreach ($tabs->getEnabledTabs() as $tab) {
+                $tab = (array) $tab;
+                $conf['tabBar'][$tab['action']]['label'] = $tab['label'];
+                $conf['tabBar'][$tab['action']]['image'] = $this->getPreviewImagesUrl($tab['image']);
+            }
+        }
+        $this->setData('conf', $conf);
+    }
+
+   /**
+    * Get preview images url
+    *
+    * @param string $name file name
+    * @return string
+    */
+    public function getPreviewImagesUrl($name = '')
+    {
+        return Mage::helper('xmlconnect/image')->getSkinImagesUrl('mobile_preview/' . $name);
+    }
+
+    /**
+     * Get application banner image url
+     *
+     * @return string
+     */
+    abstract public function getBannerImage();
+
+    /**
+     * Get background image url
+     *
+     * @return string
+     */
+    abstract public function getBackgroundImage();
+
+    /**
+     * Get font info from a config
+     *
+     * @param string $path
+     * @return string
+     */
+    public function getConfigFontInfo($path)
+    {
+        return $this->getData('conf/fonts/' . $path);
+    }
+
+    /**
+     * Get icon logo url
+     *
+     * @return string
+     */
+    public function getLogoUrl()
+    {
+        $configPath = 'conf/navigationBar/icon';
+        if ($this->getData($configPath)) {
+            return $this->getData($configPath);
+        } else {
+            return $this->getPreviewImagesUrl('smallIcon.png');
+        }
+    }
+
+    /**
+     * Get category item tint color styles
+     *
+     * @return string
+     */
+    public function getCategoryItemTintColor()
+    {
+        if (!strlen($this->_categoryItemTintColor)) {
+            $percent = .4;
+            $mask = 255;
+
+            $hex = str_replace('#','',$this->getData('conf/categoryItem/tintColor'));
+            $hex2 = '';
+            $_rgb = array();
+
+            $d = '[a-fA-F0-9]';
+
+            if (preg_match("/^($d$d)($d$d)($d$d)\$/", $hex, $rgb)) {
+                $_rgb = array(hexdec($rgb[1]), hexdec($rgb[2]), hexdec($rgb[3]));
+            }
+            if (preg_match("/^($d)($d)($d)$/", $hex, $rgb)) {
+                $_rgb = array(hexdec($rgb[1] . $rgb[1]), hexdec($rgb[2] . $rgb[2]), hexdec($rgb[3] . $rgb[3]));
+            }
+
+            for ($i=0; $i<3; $i++) {
+                $_rgb[$i] = round($_rgb[$i] * $percent) + round($mask * (1-$percent));
+                if ($_rgb[$i] > 255) {
+                    $_rgb[$i] = 255;
+                }
+            }
+
+            for($i=0; $i < 3; $i++) {
+                $hex_digit = dechex($_rgb[$i]);
+                if(strlen($hex_digit) == 1) {
+                    $hex_digit = "0" . $hex_digit;
+                }
+                $hex2 .= $hex_digit;
+            }
+            if($hex && $hex2){
+                // for IE
+                $this->_categoryItemTintColor .= "filter: progid:DXImageTransform.Microsoft.gradient";
+                $this->_categoryItemTintColor .= "(startColorstr='#".$hex2."', endColorstr='#".$hex."');";
+                // for webkit browsers
+                $this->_categoryItemTintColor .= "background:-webkit-gradient";
+                $this->_categoryItemTintColor .= "(linear, left top, left bottom, from(#".$hex2."), to(#".$hex."));";
+                // for firefox
+                $this->_categoryItemTintColor .= "background:-moz-linear-gradient(top,  #".$hex2.",  #".$hex.");";
+            }
+        }
+        return $this->_categoryItemTintColor;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Preview/Android.php b/app/code/core/Mage/XmlConnect/Model/Preview/Android.php
new file mode 100755
index 0000000000..9d529ec90d
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Preview/Android.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Android preview model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Preview_Android extends Mage_XmlConnect_Model_Preview_Abstract
+{
+    /**
+     * Current device orientation
+     *
+     * @var string
+     */
+    protected $_orientation = 'unknown';
+
+    /**
+     * Set device orientation
+     *
+     * @param string $orientation
+     * @return Mage_XmlConnect_Model_Preview_Android
+     */
+    public function setOrientation($orientation)
+    {
+        $this->_orientation = $orientation;
+        return $this;
+    }
+
+    /**
+     * Get current device orientation
+     *
+     * @return string
+     */
+    public function getOrientation()
+    {
+        return $this->_orientation;
+    }
+
+    /**
+     * Get application banner image url
+     *
+     * @return string
+     */
+    public function getBannerImage()
+    {
+        $configPath = 'conf/body/bannerAndroidImage';
+        if ($this->getData($configPath)) {
+            $bannerImage = $this->getData($configPath);
+        } else {
+            $bannerImage = $this->getPreviewImagesUrl('android/bg_logo.png');
+        }
+        return $bannerImage;
+    }
+
+    /**
+     * We doesn't support background images for android
+     *
+     * @return false
+     */
+    public function getBackgroundImage()
+    {
+        return false;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Preview/Ipad.php b/app/code/core/Mage/XmlConnect/Model/Preview/Ipad.php
new file mode 100755
index 0000000000..c734e8bb8a
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Preview/Ipad.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Ipad preview model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Preview_Ipad extends Mage_XmlConnect_Model_Preview_Abstract
+{
+    /**
+     * Current device orientation
+     *
+     * @var string
+     */
+    protected $_orientation = 'unknown';
+
+    /**
+     * Set device orientation
+     *
+     * @param string $orientation
+     * @return Mage_XmlConnect_Model_Preview_Ipad
+     */
+    public function setOrientation($orientation)
+    {
+        $this->_orientation = $orientation;
+        return $this;
+    }
+
+    /**
+     * Get current device orientation
+     *
+     * @return string
+     */
+    public function getOrientation()
+    {
+        return $this->_orientation;
+    }
+
+    /**
+     * Get application banner image url
+     *
+     * @return string
+     */
+    public function getBannerImage()
+    {
+        $configPath = 'conf/body/bannerIpadImage';
+        $imageUrlOrig = $this->getData($configPath);
+        if ($imageUrlOrig) {
+            $width = Mage_XmlConnect_Helper_Ipad::PREVIEW_BANNER_WIDTH;
+            $height = Mage_XmlConnect_Helper_Ipad::PREVIEW_BANNER_HEIGHT;
+            $bannerImage = Mage::helper('xmlconnect/image')
+                ->getCustomSizeImageUrl($imageUrlOrig, $width, $height);
+        } else {
+            $bannerImage = $this->getPreviewImagesUrl('ipad/banner_image.png');
+        }
+        return $bannerImage;
+    }
+
+    /**
+     * Get background image url according orientation
+     *
+     * @throws Mage_Core_Exception
+     * @return string
+     */
+    public function getBackgroundImage()
+    {
+        $orientation = $this->getOrientation();
+        $backgroundImage = '';
+        /** @var $helperImage Mage_XmlConnect_Helper_Image */
+        $helperImage = Mage::helper('xmlconnect/image');
+
+        switch ($orientation) {
+            case Mage_XmlConnect_Helper_Ipad::ORIENTATION_LANDSCAPE:
+                $configPath = 'conf/body/backgroundIpadLandscapeImage';
+                $imageUrlOrig = $this->getData($configPath);
+                if ($imageUrlOrig) {
+                    $width = Mage_XmlConnect_Helper_Ipad::PREVIEW_LANDSCAPE_BACKGROUND_WIDTH;
+                    $height = Mage_XmlConnect_Helper_Ipad::PREVIEW_LANDSCAPE_BACKGROUND_HEIGHT;
+                    $backgroundImage = $helperImage->getCustomSizeImageUrl($imageUrlOrig, $width, $height);
+                } else {
+                    $backgroundImage = $this->getPreviewImagesUrl('ipad/background_home_landscape.jpg');
+                }
+                break;
+            case Mage_XmlConnect_Helper_Ipad::ORIENTATION_PORTRAIT:
+                $configPath = 'conf/body/backgroundIpadPortraitImage';
+                $imageUrlOrig = $this->getData($configPath);
+                if ($imageUrlOrig) {
+                    $width = Mage_XmlConnect_Helper_Ipad::PREVIEW_PORTRAIT_BACKGROUND_WIDTH;
+                    $height = Mage_XmlConnect_Helper_Ipad::PREVIEW_PORTRAIT_BACKGROUND_HEIGHT;
+                    $backgroundImage = $helperImage->getCustomSizeImageUrl($imageUrlOrig, $width, $height);
+                } else {
+                    $backgroundImage = $this->getPreviewImagesUrl('ipad/background_portrait.jpg');
+                }
+                break;
+            default:
+                Mage::throwException(
+                    Mage::helper('xmlconnect')->__('Wrong Ipad background image orientation has been specified: "%s".', $orientation)
+                );
+                break;
+        }
+        return $backgroundImage;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Preview/Iphone.php b/app/code/core/Mage/XmlConnect/Model/Preview/Iphone.php
new file mode 100755
index 0000000000..2d7057cd7d
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/Model/Preview/Iphone.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Iphone preview model
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_Model_Preview_Iphone extends Mage_XmlConnect_Model_Preview_Abstract
+{
+    /**
+     * Get application banner image url
+     *
+     * @throws Mage_Core_Exception
+     * @return string
+     */
+    public function getBannerImage()
+    {
+        $configPath = 'conf/body/bannerImage';
+        if ($this->getData($configPath)) {
+            $bannerImage = $this->getData($configPath);
+        } else {
+            $bannerImage = $this->getPreviewImagesUrl('banner.png');
+        }
+        return $bannerImage;
+    }
+
+    /**
+     * Get background image url according device type
+     *
+     * @return string
+     */
+    public function getBackgroundImage()
+    {
+        $backgroundImage = '';
+        $configPath = 'conf/body/backgroundImage';
+        $imageUrlOrig = $this->getData($configPath);
+        if ($imageUrlOrig) {
+            $backgroundImage = $imageUrlOrig;
+        } else {
+            $backgroundImage = $this->getPreviewImagesUrl('banner.png');
+        }
+        return $backgroundImage;
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/Model/Queue.php b/app/code/core/Mage/XmlConnect/Model/Queue.php
index fb22a7218e..a74d040e7f 100755
--- a/app/code/core/Mage/XmlConnect/Model/Queue.php
+++ b/app/code/core/Mage/XmlConnect/Model/Queue.php
@@ -149,7 +149,11 @@ public function getApplicationType()
      */
     public function getAppName()
     {
-        return $this->getApplicationName() ? $this->getApplicationName() : Mage::helper('xmlconnect')->getApplicationName($this->getAppCode());
+        if ($this->getApplicationName()) {
+            return $this->getApplicationName();
+        } else {
+            return Mage::helper('xmlconnect')->getApplicationName($this->getAppCode());
+        }
     }
 
     /**
@@ -159,17 +163,20 @@ public function getAppName()
      */
     public function getTplName()
     {
-        return $this->getTemplateName() ? $this->getTemplateName() : Mage::helper('xmlconnect')->getTemplateName($this->getTemplateId());
+        if ($this->getTemplateName()) {
+            return $this->getTemplateName();
+        } else {
+            return Mage::helper('xmlconnect')->getTemplateName($this->getTemplateId());
+        }
     }
 
     /**
      * Retrieve processed template
      *
      * @param array $variables
-     * @param bool $usePreprocess
      * @return string
      */
-    public function getProcessedTemplate(array $variables = array(), $usePreprocess = false)
+    public function getProcessedTemplate(array $variables = array())
     {
         /* @var $processor Mage_Widget_Model_Template_Filter */
         $processor = Mage::getModel('widget/template_filter');
@@ -182,17 +189,23 @@ public function getProcessedTemplate(array $variables = array(), $usePreprocess
             $processor->setStoreId(1);
         }
 
-        $htmlDescription = '<div style="font-size: 0.8em; text-decoration: underline; margin-top: 1.5em; line-height: 2em;">%s:</div>';
+        $htmlDescription = <<<EOT
+<div style="font-size: 0.8em; text-decoration: underline; margin-top: 1.5em; line-height: 2em;">%s:</div>
+EOT;
 
         switch ($this->getData('type')) {
             case Mage_XmlConnect_Model_Queue::MESSAGE_TYPE_AIRMAIL:
-                $html  = sprintf($htmlDescription, Mage::helper('xmlconnect')->__('Push title')) . $this->getPushTitle();
-                $html .= sprintf($htmlDescription, Mage::helper('xmlconnect')->__('Message title')) . $this->getMessageTitle();
-                $html .= sprintf($htmlDescription, Mage::helper('xmlconnect')->__('Message content')) . $processor->filter($this->getContent());
+                $html  = sprintf($htmlDescription, Mage::helper('xmlconnect')->__('Push title'))
+                            . $this->getPushTitle();
+                $html .= sprintf($htmlDescription, Mage::helper('xmlconnect')->__('Message title'))
+                            . $this->getMessageTitle();
+                $html .= sprintf($htmlDescription, Mage::helper('xmlconnect')->__('Message content'))
+                            . $processor->filter($this->getContent());
                 break;
             case Mage_XmlConnect_Model_Queue::MESSAGE_TYPE_PUSH:
             default:
-                $html  = sprintf($htmlDescription, Mage::helper('xmlconnect')->__('Push title')) . $this->getPushTitle();
+                $html  = sprintf($htmlDescription, Mage::helper('xmlconnect')->__('Push title'))
+                            . $this->getPushTitle();
                 break;
         }
         return $html;
@@ -232,7 +245,9 @@ public function reset()
      */
     public function getAirmailBroadcastParams()
     {
-        $notificationType = Mage::getStoreConfig(sprintf(Mage_XmlConnect_Model_Queue::XML_PATH_NOTIFICATION_TYPE, $this->getApplicationType()));
+        $notificationType = Mage::getStoreConfig(
+            sprintf(Mage_XmlConnect_Model_Queue::XML_PATH_NOTIFICATION_TYPE, $this->getApplicationType())
+        );
 
         $payload = array(
             'push' => array(
@@ -265,7 +280,9 @@ public function getAirmailBroadcastParams()
      */
     public function getPushBroadcastParams()
     {
-        $notificationType = Mage::getStoreConfig(sprintf(Mage_XmlConnect_Model_Queue::XML_PATH_NOTIFICATION_TYPE, $this->getApplicationType()));
+        $notificationType = Mage::getStoreConfig(
+            sprintf(Mage_XmlConnect_Model_Queue::XML_PATH_NOTIFICATION_TYPE, $this->getApplicationType())
+        );
 
         $payload = array(
             $notificationType => array(
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Element.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Element.php
index 704d3c2ab0..8f1e1877d9 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Element.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Element.php
@@ -81,4 +81,43 @@ public function xmlAttribute($value = null)
         $value = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $value);
         return $value;
     }
+
+    /**
+     * Add field to fieldset
+     *
+     * @param string $elementName
+     * @param string $elementType
+     * @param array $config
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    public function addField($elementName, $elementType, array $config)
+    {
+        $newField = $this->addChild('field');
+        $newField->addAttribute('name', $this->xmlAttribute($elementName));
+        $newField->addAttribute('type', $this->xmlAttribute($elementType));
+        foreach ($config as $key => $val) {
+            $newField->addAttribute($key, $this->xmlAttribute($val));
+        }
+        return $newField;
+    }
+
+    /**
+     * Add custom field to SimpleXML element
+     *
+     * @param string $childName
+     * @param string $value
+     * @param array $config
+     * @return Mage_XmlConnect_Model_Simplexml_Element
+     */
+    public function addCustomChild($childName, $value = null, $config = null)
+    {
+        $customFiled = $this->addChild($childName, $this->xmlentities($value));
+
+        if (is_array($config)) {
+            foreach ($config as $key => $val) {
+                $customFiled->addAttribute($key, $this->xmlAttribute($val));
+            }
+        }
+        return $customFiled;
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/Model/Template.php b/app/code/core/Mage/XmlConnect/Model/Template.php
index 41da27eccc..0381db53bf 100755
--- a/app/code/core/Mage/XmlConnect/Model/Template.php
+++ b/app/code/core/Mage/XmlConnect/Model/Template.php
@@ -50,10 +50,9 @@ public function getType()
      * Retrieve processed template
      *
      * @param array $variables
-     * @param bool $usePreprocess
      * @return string
      */
-    public function getProcessedTemplate(array $variables = array(), $usePreprocess = false)
+    public function getProcessedTemplate(array $variables = array())
     {
         /* @var $processor Mage_Widget_Model_Template_Filter */
         $processor = Mage::getModel('widget/template_filter');
@@ -66,10 +65,17 @@ public function getProcessedTemplate(array $variables = array(), $usePreprocess
             $processor->setStoreId(1);
         }
 
-        $htmlDescription = '<div style="font-size: 0.8em; text-decoration: underline; margin-top: 1.5em; line-height: 2em;">%s:</div>';
-        $html  = sprintf($htmlDescription, Mage::helper('xmlconnect')->__('Push title')) . $this->getPushTitle();
-        $html .= sprintf($htmlDescription, Mage::helper('xmlconnect')->__('Message title')) . $this->getMessageTitle();
-        $html .= sprintf($htmlDescription, Mage::helper('xmlconnect')->__('Message content')) . $processor->filter($this->getContent());
+        $htmlDescription = <<<EOT
+<div style="font-size: 0.8em; text-decoration: underline; margin-top: 1.5em; line-height: 2em;">%s:</div>
+EOT;
+        /** @var $coreHelper Mage_Core_Helper_Data */
+        $coreHelper = Mage::helper('core');
+        $html  = sprintf($htmlDescription, Mage::helper('xmlconnect')->__('Push title'))
+                    . $this->getPushTitle();
+        $html .= sprintf($htmlDescription, Mage::helper('xmlconnect')->__('Message title'))
+                    . $this->getMessageTitle();
+        $html .= sprintf($htmlDescription, Mage::helper('xmlconnect')->__('Message content'))
+                    . $processor->filter($this->getContent());
 
         return $html;
     }
diff --git a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php
index 4f524a42de..256ed96675 100644
--- a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php
@@ -24,6 +24,13 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+/**
+ * XmlConnect Adminhtml mobile controller
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
 class Mage_XmlConnect_Adminhtml_MobileController extends Mage_Adminhtml_Controller_Action
 {
     /**
@@ -87,6 +94,8 @@ public function indexAction()
 
     /**
      * Create new app
+     *
+     * @return void
      */
     public function newAction()
     {
@@ -98,6 +107,8 @@ public function newAction()
 
     /**
      * Submission Action, loads application data
+     *
+     * @return void
      */
     public function submissionAction()
     {
@@ -110,7 +121,9 @@ public function submissionAction()
             }
             $app->loadSubmit();
             if ((bool) Mage::getSingleton('adminhtml/session')->getLoadSessionFlag(true)) {
-                $data = $this->_restoreSessionFilesFormData(Mage::getSingleton('adminhtml/session')->getFormSubmissionData(true));
+                $data = $this->_restoreSessionFilesFormData(
+                    Mage::getSingleton('adminhtml/session')->getFormSubmissionData(true)
+                );
                 if (!empty($data)) {
                     $app->setData(Mage::helper('xmlconnect')->arrayMergeRecursive($app->getData(), $data));
                 }
@@ -155,7 +168,10 @@ public function editAction()
                 return;
             }
 
-            $newAppData = $this->_restoreSessionFilesFormData(Mage::getSingleton('adminhtml/session')->getFormData(true));
+            $newAppData = $this->_restoreSessionFilesFormData(
+                Mage::getSingleton('adminhtml/session')->getFormData(true)
+            );
+
             if (!empty($newAppData)) {
                 $app->setData(Mage::helper('xmlconnect')->arrayMergeRecursive($app->getData(), $newAppData));
             }
@@ -192,6 +208,8 @@ public function editAction()
 
     /**
      * Submit POST application action
+     *
+     * @return void
      */
     public function submissionPostAction()
     {
@@ -227,8 +245,9 @@ public function submissionPostAction()
                     'title' => isset($params['title']) ? $params['title'] : '',
                     'name' => $app->getName(),
                     'code' => $app->getCode(),
-                    'activation_key' => isset($params['resubmission_activation_key']) ?
-                        $params['resubmission_activation_key'] : $params['key'],
+                    'activation_key' => isset($params['resubmission_activation_key'])
+                        ? $params['resubmission_activation_key']
+                        : $params['key'],
                 ));
                 $history->save();
                 $app->getResource()->updateApplicationStatus($app->getId(),
@@ -345,6 +364,8 @@ protected function _processPostRequest()
 
     /**
      * Save action
+     *
+     * @return void
      */
     public function saveAction()
     {
@@ -352,20 +373,20 @@ public function saveAction()
         $redirectSubmit = $this->getRequest()->getParam('submitapp', false);
         $app = false;
         $isError = false;
-        $devType = false;
         if ($data) {
             Mage::getSingleton('adminhtml/session')->setFormData($data);
             try {
                 $id = $this->getRequest()->getParam('application_id');
+
                 if (!$id && isset($data['devtype'])) {
                     $devArray = Mage::helper('xmlconnect')->getSupportedDevices();
-                    $devType = array_search($data['devtype'], $devArray);
-                    if ($devType === false) {
+                    if (!array_key_exists($data['devtype'], $devArray)) {
                         $this->_getSession()->addError($this->__('Wrong device type.'));
                         $isError = true;
                     }
                 }
-                $app = $this->_initApp('application_id', $devType);
+
+                $app = $this->_initApp('application_id', $data['devtype']);
                 if (!$app->getId() && $id) {
                     $this->_getSession()->addError($this->__('App does not exist.'));
                     $this->_redirect('*/*/');
@@ -374,6 +395,7 @@ public function saveAction()
                 $app->addData($this->_preparePostData($data));
                 $app->addData($this->_processUploadedFiles($app->getData()));
                 $errors = $app->validate();
+
                 if ($errors !== true) {
                     foreach ($errors as $err) {
                         $this->_getSession()->addError($err);
@@ -396,14 +418,15 @@ public function saveAction()
                 Mage::logException($e);
             }
         }
-        if (!$isError && is_object($app) && $app->getId() && $redirectSubmit) {
+        $isApplication = $app instanceof Mage_XmlConnect_Model_Application;
+        if (!$isError && $isApplication && $app->getId() && $redirectSubmit) {
             $this->_redirect('*/*/submission', array('application_id' => $app->getId()));
-        } else if ($isError && is_object($app) && $app->getId()) {
+        } else if ($isError && $isApplication && $app->getId()) {
             Mage::getSingleton('adminhtml/session')->setLoadSessionFlag(true);
             $this->_redirect('*/*/edit', array('application_id' => $app->getId()));
-        } else if ($isError && is_object($app) && !$app->getId() && $app->getType()) {
+        } else if ($isError && $isApplication && !$app->getId() && $app->getType()) {
             $this->_redirect('*/*/edit', array('type' => $app->getType()));
-        } else if ($this->getRequest()->getParam('back')) {
+        } else if ($this->getRequest()->getParam('back') && $isApplication) {
             $this->_redirect('*/*/edit', array('application_id' => $app->getId()));
         } else {
             $this->_redirect('*/*/');
@@ -422,22 +445,27 @@ protected function _saveThemeAction($data, $paramId = 'saveTheme')
             $themeName = $this->getRequest()->getParam($paramId, false);
             if ($themeName) {
                 if ($themeName == Mage::helper('xmlconnect/theme')->getCustomThemeName()) {
-                    $theme = Mage::helper('xmlconnect/theme')->getThemeByName($themeName);
-                    if ($theme instanceof Mage_XmlConnect_Model_Theme) {
-                        if ($paramId == 'saveTheme') {
-                            $convertedConf = $this->_convertPost($data);
+                $theme = Mage::helper('xmlconnect/theme')->getThemeByName($themeName);
+                if ($theme instanceof Mage_XmlConnect_Model_Theme) {
+                    if ($paramId == 'saveTheme') {
+                        $convertedConf = $this->_convertPost($data);
+                    } else {
+                        if (isset($data['conf'])) {
+                            $convertedConf = $data['conf'];
                         } else {
-                            if (isset($data['conf'])) {
-                                $convertedConf = $data['conf'];
-                            } else {
-                                $response = array('error' => true, 'message' => $this->__('Cannot save theme "%s". Incorrect data received', $themeName));
-                            }
+                            $response = array(
+                                'error' => true,
+                                'message' => $this->__('Cannot save theme "%s". Incorrect data received', $themeName)
+                            );
                         }
+                    }
+                    if (!isset($response)) {
                         $theme->importAndSaveData($convertedConf);
                         $response = Mage::helper('xmlconnect/theme')->getAllThemesArray(true);
-                    } else {
-                        $response = array('error' => true, 'message' => $this->__('Cannot load theme "%s".', $themeName));
                     }
+                } else {
+                    $response = array('error' => true, 'message' => $this->__('Cannot load theme "%s".', $themeName));
+                }
                 } else {
                     $response = Mage::helper('xmlconnect/theme')->getAllThemesArray(true);
                 }
@@ -491,6 +519,8 @@ protected function _convertPost($data)
 
     /**
      * Save Theme action
+     *
+     * @return void
      */
     public function saveThemeAction()
     {
@@ -500,12 +530,14 @@ public function saveThemeAction()
 
     /**
      * Save Theme action
+     *
+     * @return void
      */
     public function resetThemeAction()
     {
-        $response = false;
         try {
-            Mage::helper('xmlconnect/theme')->resetAllThemes();
+            $theme = $this->getRequest()->getPost('theme', null);
+            Mage::helper('xmlconnect/theme')->resetTheme($theme);
             $response = Mage::helper('xmlconnect/theme')->getAllThemesArray(true);
         } catch (Mage_Core_Exception $e) {
             $response = array(
@@ -526,6 +558,8 @@ public function resetThemeAction()
 
     /**
      * Preview Home action handler
+     *
+     * @return void
      */
     public function previewHomeAction()
     {
@@ -542,6 +576,8 @@ public function previewHomeHorAction()
 
     /**
      * Preview Catalog action handler
+     *
+     * @return void
      */
     public function previewCatalogAction()
     {
@@ -588,40 +624,38 @@ public function previewTemplateAction()
     /**
      * Preview action implementation
      *
-     * @param string    $block
+     * @param string $block
      */
     protected function _previewAction($block)
     {
         $redirectBack = false;
-
         try {
-            $deviceTitle = $this->getRequest()->getParam('devtype');
-            $deviceType = array_search($deviceTitle, Mage::helper('xmlconnect')->getSupportedDevices());
+            $deviceType = $this->getRequest()->getParam('devtype');
             $app = $this->_initApp('application_id', $deviceType);
             if (!$this->getRequest()->getParam('submission_action')) {
                 $app->addData($this->_preparePostData($this->getRequest()->getPost()));
             }
-
-            // render base configuration of application
+            /** render base configuration of application */
             $appConf = $app->getRenderConf();
-
             try {
-                // try to upload files
+                /** try to upload files */
                 $dataUploaded = $this->_processUploadedFiles($app->getData());
                 $app->addData($dataUploaded);
-                // render configuration with just uploaded images
+                /** render configuration with just uploaded images */
                 $appConf = $app->getRenderConf();
             } catch (Exception $e) {
-                // when cannot upload - just tell user what is happen
+                /** when cannot upload - just tell user what is happen */
                 $jsErrorMessage = addslashes($e->getMessage());
             }
 
             $this->loadLayout(false);
             $preview = $this->getLayout()->getBlock($block);
+
             if (isset($jsErrorMessage)) {
                 $preview->setJsErrorMessage($jsErrorMessage);
             }
             $preview->setConf($appConf);
+            Mage::helper('xmlconnect')->getPreviewModel()->setConf($appConf);
             $this->renderLayout();
             return;
         } catch (Mage_Core_Exception $e) {
@@ -631,7 +665,7 @@ protected function _previewAction($block)
             $this->_getSession()->addException($e, $this->__('Unable to process preview.'));
             $redirectBack = true;
         }
-        if (isset($app) && is_object($app) && $redirectBack) {
+        if (isset($app) && $app instanceof Mage_XmlConnect_Model_Application && $redirectBack) {
             $this->_redirect('*/*/edit', array('application_id' => $app->getId()));
         } else {
             $this->_redirect('*/*/');
@@ -640,6 +674,8 @@ protected function _previewAction($block)
 
     /**
      * Delete app action
+     *
+     * @return void
      */
     public function deleteAction()
     {
@@ -716,6 +752,8 @@ public function historyAction()
 
     /**
      * Render apps grid
+     *
+     * @return void
      */
     public function gridAction()
     {
@@ -771,29 +809,43 @@ protected function _processUploadedFiles($data, $restore = false)
     public function _preparePostData(array $arr)
     {
         unset($arr['code']);
-        if (isset($arr['conf']['new_pages']) && isset($arr['conf']['new_pages']['ids'])
-            && isset($arr['conf']['new_pages']['labels'])) {
-
-            $newPages = array();
-            foreach ($arr['conf']['new_pages']['ids'] as $key=>$value) {
-                $newPages[$key]['id'] = trim($value);
+        if (!empty($arr['conf']['native']['pages'])) {
+            /**
+             * Remove emptied pages
+             */
+            $pages = array();
+            foreach ($arr['conf']['native']['pages'] as $_page) {
+                if (!empty($_page['id']) && !empty($_page['label'])) {
+                    $pages[] = $_page;
+                }
             }
-            foreach ($arr['conf']['new_pages']['labels'] as $key=>$value) {
-                $newPages[$key]['label'] = trim($value);
+            $arr['conf']['native']['pages'] = $pages;
+        }
+        if (isset($arr['conf']['new_pages']['ids']) && isset($arr['conf']['new_pages']['labels'])) {
+            $newPages = array();
+            $cmsPages = &$arr['conf']['new_pages'];
+            $idx = 0;
+            foreach ($cmsPages['ids'] as $key => $value) {
+                if (!empty($value) && !empty($cmsPages['labels'][$key])) {
+                    $newPages[$idx]['id'] = trim($value);
+                    $newPages[$idx++]['label'] = trim($cmsPages['labels'][$key]);
+                }
             }
             if (!isset($arr['conf']['native']['pages'])) {
                 $arr['conf']['native']['pages'] = array();
             }
-            foreach ($newPages as $key => $page) {
-                if (empty($page['id']) || empty($page['label'])) {
-                    unset($newPages[$key]);
-                }
-            }
             if (!empty($newPages)) {
                 $arr['conf']['native']['pages'] = array_merge($arr['conf']['native']['pages'], $newPages);
             }
             unset($arr['conf']['new_pages']);
         }
+
+        /**
+         * Check cache settings
+         */
+        $lifetime = &$arr['conf']['native']['cacheLifetime'];
+        $lifetime = $lifetime <= 0 ? '' : (int)$lifetime;
+
         /**
          * Restoring current_theme over selected but not applied theme
          */
@@ -858,6 +910,8 @@ protected function _initTemplate($paramName = 'id')
 
     /**
      * List AirMail message queue grid
+     *
+     * @return void
      */
     public function queueAction()
     {
@@ -868,6 +922,8 @@ public function queueAction()
 
     /**
      * Edit message action
+     *
+     * @return void
      */
     public function editQueueAction()
     {
@@ -1009,6 +1065,8 @@ public function massDeleteQueueAction()
 
     /**
      * Save AirMail message action
+     *
+     * @return void
      */
     public function saveMessageAction()
     {
@@ -1018,6 +1076,7 @@ public function saveMessageAction()
 
         if ($data) {
             try {
+                $data = Mage::getModel('core/input_filter_maliciousCode')->filter($data);
                 $template = $this->_initTemplate('template_id');
                 $message = $this->_initMessage();
 
@@ -1042,7 +1101,7 @@ public function saveMessageAction()
                     $message->setStatus(Mage_XmlConnect_Model_Queue::STATUS_IN_QUEUE);
                 } elseif ($message->getStatus() != Mage_XmlConnect_Model_Queue::STATUS_IN_QUEUE) {
                     $this->_getSession()->addError(
-                        $this->__('Message can not be edited when it\'s status NOT is "IN QUEUE".')
+                        $this->__('Message can be edited when status of the message is "IN QUEUE" only.')
                     );
                     $this->_redirect('*/*/queue');
                     return;
@@ -1059,7 +1118,9 @@ public function saveMessageAction()
                         break;
                 }
                 if ($temporaryObject->getExecTime()) {
-                    $message->setExecTime(Mage::getSingleton('core/date')->gmtDate(null, $temporaryObject->getExecTime()));
+                    $message->setExecTime(
+                        Mage::getSingleton('core/date')->gmtDate(null, $temporaryObject->getExecTime())
+                    );
                 } else {
                     $message->setExecTime(new Zend_Db_Expr('NULL'));
                 }
@@ -1094,11 +1155,12 @@ public function saveMessageAction()
         } else {
             $this->_redirect('*/*/queue');
         }
-
     }
 
     /**
      * Temlate grid
+     *
+     * @return void
      */
     public function templateAction()
     {
@@ -1109,6 +1171,8 @@ public function templateAction()
 
     /**
      * Create new template action
+     *
+     * @return void
      */
     public function newTemplateAction()
     {
@@ -1117,6 +1181,8 @@ public function newTemplateAction()
 
     /**
      * Edit template action
+     *
+     * @return void
      */
     public function editTemplateAction()
     {
@@ -1138,6 +1204,8 @@ public function editTemplateAction()
 
     /**
      * Save template action
+     *
+     * @return void
      */
     public function saveTemplateAction()
     {
@@ -1145,6 +1213,7 @@ public function saveTemplateAction()
         $template = false;
         $isError = false;
         if ($data) {
+            $data = Mage::getModel('core/input_filter_maliciousCode')->filter($data);
             Mage::getSingleton('adminhtml/session')->setFormData($data);
             try {
                 $id = $this->getRequest()->getParam('id');
@@ -1176,6 +1245,8 @@ public function saveTemplateAction()
 
     /**
      * Add message to queue action
+     *
+     * @return void
      */
     public function queueMessageAction()
     {
@@ -1209,11 +1280,11 @@ public function queueMessageAction()
 
     /**
      * Edit queue message action
+     *
+     * @return void
      */
     public function editMessageAction()
     {
         $this->_forward('queueMessage');
     }
 }
-
-
diff --git a/app/code/core/Mage/XmlConnect/controllers/CartController.php b/app/code/core/Mage/XmlConnect/controllers/CartController.php
index 66b3e0b99b..38c5206594 100644
--- a/app/code/core/Mage/XmlConnect/controllers/CartController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/CartController.php
@@ -170,7 +170,8 @@ public function addAction()
                  */
                 $qty = isset($params['qty']) ? $params['qty'] : 0;
                 $requestedQty = ($qty > 1) ? $qty : 1;
-                $subProduct = $product->getTypeInstance(true)->getProductByAttributes($request->getSuperAttribute(), $product);
+                $subProduct = $product->getTypeInstance(true)
+                    ->getProductByAttributes($request->getSuperAttribute(), $product);
 
                 if ($requestedQty < ($requiredQty = $subProduct->getStockItem()->getMinSaleQty())) {
                     $requestedQty = $requiredQty;
@@ -188,6 +189,29 @@ public function addAction()
 
             $this->_getSession()->setCartWasUpdated(true);
 
+            if (isset($params['whishlist_id'])) {
+                $wishlist = $this->_getWishlist();
+                $id = (int) $params['whishlist_id'];
+                $item = Mage::getModel('wishlist/item')->load($id);
+
+                if ($item->getWishlistId() == $wishlist->getId()) {
+                    try {
+                        $item->delete();
+                        $wishlist->save();
+                    } catch (Mage_Core_Exception $e) {
+                        $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
+                    } catch(Exception $e) {
+                        $this->_message(
+                            $this->__('An error occurred while removing item from wishlist.'),
+                            self::MESSAGE_STATUS_ERROR
+                        );
+                    }
+                } else {
+                    $wishlistMessage = $this->__('Specified item does not exist in wishlist.');
+                }
+                Mage::helper('wishlist')->calculate();
+            }
+
             /**
              * @todo remove wishlist observer processAddToCart
              */
@@ -196,17 +220,23 @@ public function addAction()
             );
 
             if (!$this->_getSession()->getNoCartRedirect(true)) {
-                $message = $this->__('%s has been added to your cart.', Mage::helper('core')->htmlEscape($product->getName()));
-                if ($cart->getQuote()->getHasError()) {
-                    $message .= $this->__(' But cart has some errors.');
+                if (isset($wishlistMessage)) {
+                    $this->_message($wishlistMessage, self::MESSAGE_STATUS_ERROR);
+                } else {
+                    $productName = Mage::helper('core')->htmlEscape($product->getName());
+                    $message = $this->__('%s has been added to your cart.', $productName);
+                    if ($cart->getQuote()->getHasError()) {
+                        $message .= $this->__(' But cart has some errors.');
+                    }
+                    $this->_message($message, parent::MESSAGE_STATUS_SUCCESS);
                 }
-                $this->_message($message, parent::MESSAGE_STATUS_SUCCESS);
             }
         } catch (Mage_Core_Exception $e) {
             if ($this->_getSession()->getUseNotice(true)) {
                 $this->_message($e->getMessage(), parent::MESSAGE_STATUS_ERROR);
             } else {
-                $this->_message(implode("\n", array_unique(explode("\n", $e->getMessage()))), parent::MESSAGE_STATUS_ERROR);
+                $messageText = implode("\n", array_unique(explode("\n", $e->getMessage())));
+                $this->_message($messageText, parent::MESSAGE_STATUS_ERROR);
             }
         } catch (Exception $e) {
             $this->_message($this->__('Can\'t add item to shopping cart.'), self::MESSAGE_STATUS_ERROR);
@@ -323,4 +353,25 @@ protected function _getQuote()
     {
         return $this->_getCart()->getQuote();
     }
+
+    /**
+     * Retrieve wishlist object
+     *
+     * @return Mage_Wishlist_Model_Wishlist|false
+     */
+    protected function _getWishlist()
+    {
+        try {
+            $wishlist = Mage::getModel('wishlist/wishlist')
+                ->loadByCustomer(Mage::getSingleton('customer/session')->getCustomer(), true);
+            Mage::register('wishlist', $wishlist);
+        } catch (Mage_Core_Exception $e) {
+            $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
+            return false;
+        } catch (Exception $e) {
+            $this->_message($this->__('Can\'t create wishlist.'), self::MESSAGE_STATUS_ERROR);
+            return false;
+        }
+        return $wishlist;
+    }
 }
diff --git a/app/code/core/Mage/XmlConnect/controllers/CatalogController.php b/app/code/core/Mage/XmlConnect/controllers/CatalogController.php
index ea04fef8c2..c85ce09e73 100644
--- a/app/code/core/Mage/XmlConnect/controllers/CatalogController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/CatalogController.php
@@ -27,7 +27,9 @@
 /**
  * XmlConnect catalog controller
  *
- * @author  Magento Core Team <core@magentocommerce.com>
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Mage_XmlConnect_CatalogController extends Mage_XmlConnect_Controller_Action
 {
@@ -56,7 +58,10 @@ public function filtersAction()
             $this->_message($e->getMessage(), self::MESSAGE_STATUS_ERROR);
         } catch (Exception $e) {
             Mage::logException($e);
-            $this->_message($this->__('An error occurred while loading category filters.'), self::MESSAGE_STATUS_ERROR);
+            $this->_message(
+                $this->__('An error occurred while loading category filters.'),
+                self::MESSAGE_STATUS_ERROR
+            );
         }
     }
 
@@ -130,16 +135,14 @@ public function productReviewAction()
      */
     public function searchAction()
     {
+        /** @var $_helper Mage_CatalogSearch_Helper_Data */
         $_helper = Mage::helper('catalogsearch');
         $queryParam = str_replace('%20', ' ', $this->getRequest()->getParam('query'));
         $this->getRequest()->setParam($_helper->getQueryParamName(), $queryParam);
+        /** @var $query Mage_CatalogSearch_Model_Query */
         $query = $_helper->getQuery();
-        /* @var $query Mage_CatalogSearch_Model_Query */
-
         $query->setStoreId(Mage::app()->getStore()->getId());
-        //
-        //   return Mage::helper('catalogsearch')->__('Minimum Search query length is %s', $this->_getQuery()->getMinQueryLength());
-        //
+
         if ($query->getQueryText()) {
             if ($_helper->isMinQueryLength()) {
                 $query->setId(0)
@@ -152,7 +155,12 @@ public function searchAction()
                     $query->setPopularity(1);
                 }
 
-                if ($query->getRedirect()) {
+                /**
+                 * We don't support redirect at this moment
+                 *
+                 * @todo add redirect support for mobile application
+                 */
+                if (false && $query->getRedirect()) {
                     $query->save();
                     $this->getResponse()->setRedirect($query->getRedirect());
                     return;
@@ -232,12 +240,14 @@ public function sendEmailAction()
         $model->setWebsiteId(Mage::app()->getStore()->getWebsiteId());
 
         Mage::register('send_to_friend_model', $model);
-
+/*
         if ($model->getMaxSendsToFriend()) {
-//            $this->_message($this->__('Messages cannot be sent more than %d times in an hour.', $model->getMaxSendsToFriend()), self::MESSAGE_STATUS_WARNING);
-//            return $this;
+            $this->_message($this->__('Messages cannot be sent more than %d times in an hour.',
+                    $model->getMaxSendsToFriend()),
+                    self::MESSAGE_STATUS_WARNING);
+            return $this;
         }
-
+*/
         $data = $this->getRequest()->getPost();
 
         if (!$data) {
@@ -286,7 +296,6 @@ public function sendEmailAction()
         } catch (Exception $e) {
             $this->_message($this->__('Some emails were not sent.'), self::MESSAGE_STATUS_ERROR);
         }
-
         return $this;
     }
 }
diff --git a/app/code/core/Mage/XmlConnect/controllers/CheckoutController.php b/app/code/core/Mage/XmlConnect/controllers/CheckoutController.php
index 82dc6de62f..51d02f0a28 100644
--- a/app/code/core/Mage/XmlConnect/controllers/CheckoutController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/CheckoutController.php
@@ -42,7 +42,8 @@ public function preDispatch()
     {
         parent::preDispatch();
         if (!Mage::getSingleton('customer/session')->isLoggedIn()
-            && !Mage::getSingleton('checkout/session')->getQuote()->isAllowedGuestCheckout()) {
+            && !Mage::getSingleton('checkout/session')->getQuote()->isAllowedGuestCheckout()
+        ) {
             $this->setFlag('', self::FLAG_NO_DISPATCH, true);
             $this->_message($this->__('Customer not logged in.'), self::MESSAGE_STATUS_ERROR);
             return ;
@@ -175,6 +176,30 @@ public function saveShippingAddressAction()
 
         $data = $this->getRequest()->getPost('shipping', array());
         $customerAddressId = $this->getRequest()->getPost('shipping_address_id', false);
+        /**
+         * For future use, please do not remove for now
+         */
+        $useForShipping = $this->getRequest()->getPost('use_for_shipping');
+
+        $billingAddress = $this->getOnepage()->getQuote()->getBillingAddress();
+        /**
+         * Checking whether shipping address is the same with billing address?
+         * This should be removed when mobile app will send just the 'use_for_shipping' flag
+         */
+        if (is_null($useForShipping)) {
+            $useForShipping = $this->_checkUseForShipping($data, $billingAddress, $customerAddressId);
+        }
+
+        if ($useForShipping) {
+            /**
+             * Set address Id with the billing address Id
+             */
+            $customerAddressId = $billingAddress->getId();
+            /**
+             * Set flag of shipping address is same as billing address
+             */
+            $data['same_as_billing'] = true;
+        }
         $result = $this->getOnepage()->saveShipping($data, $customerAddressId);
         if (!isset($result['error'])) {
             $this->_message($this->__('Shipping address has been set.'), self::MESSAGE_STATUS_SUCCESS);
@@ -186,6 +211,50 @@ public function saveShippingAddressAction()
         }
     }
 
+    /**
+     * Checks the shipping address is equal with billing address
+     *
+     * ATTENTION!!!
+     * It should be removed when mobile app will send just the 'use_for_shipping' flag
+     * instead of send shipping address same as a billing address
+     *
+     * @todo Remove when mobile app will send just the 'use_for_shipping' flag
+     * @param array $data
+     * @param Mage_Sales_Model_Quote_Address $billingAddress
+     * @param integer $shippingAddressId
+     * @return bool
+     */
+    protected function _checkUseForShipping(array $data, $billingAddress, $shippingAddressId)
+    {
+        $useForShipping = !$shippingAddressId || $billingAddress->getId() == $shippingAddressId;
+
+        if ($useForShipping) {
+            foreach ($data as $key => $value) {
+                if ($key == 'save_in_address_book') {
+                    continue;
+                }
+                $billingData = $billingAddress->getDataUsingMethod($key);
+                if (is_array($value) && is_array($billingData)) {
+                    foreach ($value as $k => $v) {
+                        if (!isset($billingData[$k]) || $billingData[$k] != trim($v)) {
+                            $useForShipping = false;
+                            break;
+                        }
+                    }
+                } else {
+                    if (is_string($value) && $billingData != trim($value)) {
+                        $useForShipping = false;
+                        break;
+                    } else {
+                        $useForShipping = false;
+                        break;
+                    }
+                }
+            }
+        }
+        return $useForShipping;
+    }
+
     /**
      * Get shipping methods for current quote
      *
@@ -226,7 +295,10 @@ public function saveShippingMethodAction()
             if (!is_array($result['message'])) {
                 $result['message'] = array($result['message']);
             }
-            Mage::dispatchEvent('checkout_controller_onepage_save_shipping_method', array('request'=>$this->getRequest(), 'quote'=>$this->getOnepage()->getQuote()));
+            Mage::dispatchEvent('checkout_controller_onepage_save_shipping_method', array(
+                'request' => $this->getRequest(),
+                'quote' => $this->getOnepage()->getQuote()
+            ));
             $this->_message(implode('. ', $result['message']), self::MESSAGE_STATUS_ERROR);
         }
     }
@@ -364,7 +436,6 @@ public function saveOrderAction()
             $error = $this->__('An error occurred while processing your order. Please contact us or try again later.');
         }
         $this->getOnepage()->getQuote()->save();
-
         $this->_message($error, self::MESSAGE_STATUS_ERROR);
     }
 }
diff --git a/app/code/core/Mage/XmlConnect/controllers/ConfigurationController.php b/app/code/core/Mage/XmlConnect/controllers/ConfigurationController.php
index 2855933913..445032dfa3 100644
--- a/app/code/core/Mage/XmlConnect/controllers/ConfigurationController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/ConfigurationController.php
@@ -27,7 +27,9 @@
 /**
  * XmlConnect index controller
  *
- * @author  Magento Core Team <core@magentocommerce.com>
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Mage_XmlConnect_ConfigurationController extends Mage_Core_Controller_Front_Action
 {
@@ -52,9 +54,10 @@ protected function _initApp()
     {
 
         $cookieName = Mage_XmlConnect_Model_Application::APP_CODE_COOKIE_NAME;
-        $screenSizeCookieName = Mage_XmlConnect_Model_Application::APP_SCREEN_SIZE_NAME;
         $code = $this->getRequest()->getParam($cookieName);
-        $screenSize = (string) $this->getRequest()->getParam($screenSizeCookieName);
+        $screenSize = (string) $this->getRequest()->getParam(
+            Mage_XmlConnect_Model_Application::APP_SCREEN_SIZE_NAME
+        );
         /** @var $app Mage_XmlConnect_Model_Application */
         $app = Mage::getModel('xmlconnect/application');
         if ($app) {
@@ -73,6 +76,47 @@ protected function _initApp()
         return $app;
     }
 
+    /**
+     * Set application cookies
+     *
+     * Set application coolies: application code and device screen size.
+     *
+     * @param Mage_XmlConnect_Model_Application $app
+     * @return void
+     */
+    protected function _initCookies(Mage_XmlConnect_Model_Application $app)
+    {
+        $cookieToSetArray = array (
+            array(
+                'cookieName'    => Mage_XmlConnect_Model_Application::APP_CODE_COOKIE_NAME,
+                'paramName'     => Mage_XmlConnect_Model_Application::APP_CODE_COOKIE_NAME,
+                'value'         => $app->getCode()),
+            array(
+                'cookieName'    => Mage_XmlConnect_Model_Application::APP_SCREEN_SIZE_NAME,
+                'paramName'     => Mage_XmlConnect_Model_Application::APP_SCREEN_SIZE_NAME,
+                'value'         => $app->getScreenSize())
+        );
+        foreach ($cookieToSetArray as $item) {
+            if (!isset($_COOKIE[$item['cookieName']])
+                || $_COOKIE[$item['cookieName']] != $this->getRequest()->getParam($item['paramName'])
+            ) {
+                /**
+                 * @todo add management of cookie expire to application admin panel
+                 */
+                $cookieExpireOffset = 3600 * 24 * 30;
+                Mage::getSingleton('core/cookie')->set(
+                    $item['cookieName'],
+                    $item['value'],
+                    $cookieExpireOffset,
+                    '/',
+                    null,
+                    null,
+                    true
+                );
+            }
+        }
+    }
+
     /**
      * Default action
      *
@@ -81,37 +125,15 @@ protected function _initApp()
     public function indexAction()
     {
         try {
-
+            /** @var $app Mage_XmlConnect_Model_Application */
             $app = $this->_initApp();
-
-            $cookieToSetArray = array (
-                array(
-                    'cookieName' => Mage_XmlConnect_Model_Application::APP_CODE_COOKIE_NAME,
-                    'paramName' => 'app_code',
-                    'value' => $app->getCode()),
-                array(
-                    'cookieName' => Mage_XmlConnect_Model_Application::APP_SCREEN_SIZE_NAME,
-                    'paramName' => Mage_XmlConnect_Model_Application::APP_SCREEN_SIZE_NAME,
-                    'value' => $app->getScreenSize())
-            );
-            foreach ($cookieToSetArray as $item) {
-                if (!isset($_COOKIE[$item['cookieName']]) ||
-                    (isset($_COOKIE[$item['cookieName']]) &&
-                        ($_COOKIE[$item['cookieName']] != $this->getRequest()->getParam($item['paramName']))
-                    )) {
-                    /**
-                     * @todo add management of cookie expire to application admin panel
-                     */
-                    $cookieExpireOffset = 3600 * 24 * 30;
-                    Mage::getSingleton('core/cookie')->set($item['cookieName'], $item['value'], $cookieExpireOffset, '/', null, null, true);
-                }
-            }
+            $this->_initCookies($app);
 
             if ($this->getRequest()->getParam('updated_at')) {
                 $updatedAt = strtotime($app->getUpdatedAt());
                 $loadedAt = (int) $this->getRequest()->getParam('updated_at');
                 if ($loadedAt >= $updatedAt) {
-                    $message = new Mage_XmlConnect_Model_Simplexml_Element('<message></message>');
+                    $message = Mage::getModel('xmlconnect/simplexml_element', '<message></message>');
                     $message->addChild('status', Mage_XmlConnect_Controller_Action::MESSAGE_STATUS_SUCCESS);
                     $message->addChild('no_changes', '1');
                     $this->getResponse()->setBody($message->asNiceXml());
@@ -121,17 +143,33 @@ public function indexAction()
             $this->loadLayout(false);
             $this->renderLayout();
         } catch (Mage_Core_Exception $e) {
-            $message = new Mage_XmlConnect_Model_Simplexml_Element('<message></message>');
-            $message->addChild('status', Mage_XmlConnect_Controller_Action::MESSAGE_STATUS_ERROR);
-            $message->addChild('text', $e->getMessage());
-            $this->getResponse()->setBody($message->asNiceXml());
+            $this->_message(
+                $e->getMessage(),
+                Mage_XmlConnect_Controller_Action::MESSAGE_STATUS_ERROR
+            );
         } catch (Exception $e) {
-            $message = new Mage_XmlConnect_Model_Simplexml_Element('<message></message>');
-            $message->addChild('status', Mage_XmlConnect_Controller_Action::MESSAGE_STATUS_ERROR);
-            $message->addChild('text', $this->__('Can\'t show configuration.'));
+            $this->_message(
+                $this->__('Can\'t show configuration.'),
+                Mage_XmlConnect_Controller_Action::MESSAGE_STATUS_ERROR
+            );
             Mage::logException($e);
-            $this->getResponse()->setBody($message->asNiceXml());
         }
+    }
 
+    /**
+     * Generate message xml and set it to response body
+     *
+     * @param string $text
+     * @param string $status
+     * @param string $type
+     * @param string $action
+     * @return void
+     */
+    protected function _message($text, $status, $type='', $action='')
+    {
+        $message = Mage::getModel('xmlconnect/simplexml_element', '<message></message>');
+        $message->addChild('status', $status);
+        $message->addChild('text', $text);
+        $this->getResponse()->setBody($message->asNiceXml());
     }
 }
diff --git a/app/code/core/Mage/XmlConnect/controllers/PbridgeController.php b/app/code/core/Mage/XmlConnect/controllers/PbridgeController.php
new file mode 100755
index 0000000000..0396cd488c
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/controllers/PbridgeController.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Pbridge controller
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_PbridgeController extends Mage_Core_Controller_Front_Action
+{
+    /**
+     * Load only action layout handles
+     *
+     * @return Enterprise_Pbridge_PbridgeController
+     */
+    protected function _initActionLayout()
+    {
+        if (!$this->_checkPbridge()) {
+            return;
+        }
+        $this->_checkPbridge();
+        $this->addActionLayoutHandles();
+        $this->loadLayoutUpdates();
+        $this->generateLayoutXml();
+        $this->generateLayoutBlocks();
+        $this->_isLayoutLoaded = true;
+        return $this;
+    }
+
+    /**
+     * Check is available Payment Bridge module
+     *
+     * @return bool
+     */
+    protected function _checkPbridge()
+    {
+        if (!is_object(Mage::getConfig()->getNode('modules/Enterprise_Pbridge'))) {
+            $this->getResponse()->setBody(
+                $this->__('Payment Bridge module unavailable.')
+            );
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Index Action.
+     * Forward to result action
+     *
+     * @return void
+     */
+    public function indexAction()
+    {
+        $this->_forward('result');
+    }
+
+    /**
+     * Result Action
+     *
+     * @return void
+     */
+    public function resultAction()
+    {
+        $this->_initActionLayout();
+        $this->renderLayout();
+    }
+
+    /**
+     * Output action with params that was given by payment bridge
+     *
+     * @return viod
+     */
+    public function outputAction()
+    {
+        if (!$this->_checkPbridge()) {
+            return;
+        }
+        $this->loadLayout(false);
+
+        $method = $this->getRequest()->getParam('method', false);
+        $originalPaymentMethod = $this->getRequest()->getParam('original_payment_method', false);
+        $token = $this->getRequest()->getParam('token', false);
+
+        $ccLast4 = $this->getRequest()->getParam('cc_last4', false);
+        $ccType  = $this->getRequest()->getParam('cc_type', false);
+
+        if ($originalPaymentMethod && $token && $ccLast4 && $ccType) {
+            $message = Mage::helper('enterprise_pbridge')->__('Payment Bridge Selected');
+            $methodName = 'payment[pbridge_data][original_payment_method]';
+            $inputType = '<input type="hidden"';
+            $body = <<<EOT
+    <div id="payment_form_{$method}">
+        {$message}
+        {$inputType} id="{$method}_original_payment_method" name="{$methodName}" value="{$originalPaymentMethod}">
+        {$inputType} id="{$method}_token" name="payment[pbridge_data][token]" value="{$token}">
+        {$inputType} id="{$method}_cc_last4" name="payment[pbridge_data][cc_last4]" value="{$ccLast4}">
+        {$inputType} id="{$method}_cc_type" name="payment[pbridge_data][cc_type]" value="{$ccType}">
+    </div>
+EOT;
+        } else {
+            $message = $this->__('Error while reading data from Payment Bridge. Please, try again.');
+            $body = <<<EOT
+    <div id="payment_form_error">
+        {$message}
+    </div>
+EOT;
+        }
+
+        $this->getResponse()->setBody(
+            html_entity_decode(Mage::helper('xmlconnect')->htmlize($body))
+        );
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/controllers/ReviewController.php b/app/code/core/Mage/XmlConnect/controllers/ReviewController.php
new file mode 100644
index 0000000000..ec1c100f47
--- /dev/null
+++ b/app/code/core/Mage/XmlConnect/controllers/ReviewController.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * XmlConnect review controller
+ *
+ * @author  Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_XmlConnect_ReviewController extends Mage_XmlConnect_Controller_Action
+{
+    /**
+     * Initialize and check product
+     *
+     * @return Mage_Catalog_Model_Product
+     */
+    protected function _initProduct()
+    {
+        Mage::dispatchEvent('review_controller_product_init_before', array('controller_action'=>$this));
+        $productId  = (int) $this->getRequest()->getParam('id');
+        $product = $this->_loadProduct($productId);
+
+        try {
+            Mage::dispatchEvent(
+                'review_controller_product_init',
+                array('product' => $product)
+            );
+            Mage::dispatchEvent(
+                'review_controller_product_init_after',
+                array(
+                    'product'           => $product,
+                    'controller_action' => $this
+                )
+            );
+        } catch (Mage_Core_Exception $e) {
+            Mage::logException($e);
+            return false;
+        }
+
+        return $product;
+    }
+
+    /**
+     * Load product model with data by passed id.
+     * Return false if product was not loaded or has incorrect status.
+     *
+     * @param int $productId
+     * @return bool | Mage_Catalog_Model_Product
+     */
+    protected function _loadProduct($productId)
+    {
+        if (!$productId) {
+            return false;
+        }
+
+        $product = Mage::getModel('catalog/product')
+            ->setStoreId(Mage::app()->getStore()->getId())
+            ->load($productId);
+        /** @var $product Mage_Catalog_Model_Product */
+        if (!$product->getId() || !$product->isVisibleInCatalog() || !$product->isVisibleInSiteVisibility()) {
+            return false;
+        }
+
+        Mage::register('current_product', $product);
+        Mage::register('product', $product);
+
+        return $product;
+    }
+
+    /**
+     * Check if guest is allowed to write review
+     *
+     * Do check the customer is logged in or guest is allowed to write review
+     *
+     * @return bool
+     */
+    protected function _checkGuestAllowed()
+    {
+        if (Mage::getSingleton('customer/session')->isLoggedIn()
+            || Mage::helper('review')->getIsGuestAllowToWrite()
+        ) {
+            return true;
+        }
+
+        $this->_message(
+            $this->__('Only registered users can write reviews. Please, log in or register.'),
+            self::MESSAGE_STATUS_ERROR
+        );
+        return false;
+    }
+
+    /**
+     * Get review form
+     *
+     * @return void
+     */
+    public function formAction()
+    {
+        if (!$this->_checkGuestAllowed()) {
+            return;
+        }
+
+        $this->loadLayout(false);
+        $this->renderLayout();
+    }
+
+    /**
+     * Save product review
+     *
+     * @return void
+     */
+    public function saveAction()
+    {
+        if (!$this->_checkGuestAllowed()) {
+            return;
+        }
+
+        $data   = $this->getRequest()->getPost();
+        $rating = $this->getRequest()->getPost('ratings', array());
+
+        if (($product = $this->_initProduct()) && !empty($data)) {
+            /** @var $review Mage_Review_Model_Review */
+            $review     = Mage::getModel('review/review')->setData($data);
+
+            if (($validate = $review->validate()) === true) {
+                try {
+                    $review->setEntityId($review->getEntityIdByCode(Mage_Review_Model_Review::ENTITY_PRODUCT_CODE))
+                        ->setEntityPkValue($product->getId())
+                        ->setStatusId(Mage_Review_Model_Review::STATUS_PENDING)
+                        ->setCustomerId(Mage::getSingleton('customer/session')->getCustomerId())
+                        ->setStoreId(Mage::app()->getStore()->getId())
+                        ->setStores(array(Mage::app()->getStore()->getId()))
+                        ->save();
+
+                    foreach ($rating as $ratingId => $optionId) {
+                        Mage::getModel('rating/rating')
+                            ->setRatingId($ratingId)
+                            ->setReviewId($review->getId())
+                            ->setCustomerId(Mage::getSingleton('customer/session')->getCustomerId())
+                            ->addOptionVote($optionId, $product->getId());
+                    }
+
+                    $review->aggregate();
+                    $this->_message(
+                        $this->__('Your review has been accepted for moderation.'),
+                        self::MESSAGE_STATUS_SUCCESS
+                    );
+                } catch (Exception $e) {
+                    $this->_message($this->__('Unable to post the review.'), self::MESSAGE_STATUS_ERROR);
+                }
+            } else {
+                if (is_array($validate)) {
+                    $this->_message(implode('. ', $validate), self::MESSAGE_STATUS_ERROR);
+                } else {
+                    $this->_message($this->__('Unable to post the review.'), self::MESSAGE_STATUS_ERROR);
+                }
+            }
+        } else {
+            $this->_message($this->__('Unable to post the review.'), self::MESSAGE_STATUS_ERROR);
+        }
+    }
+}
diff --git a/app/code/core/Mage/XmlConnect/controllers/WishlistController.php b/app/code/core/Mage/XmlConnect/controllers/WishlistController.php
index 66d6e2dacc..f774393b58 100644
--- a/app/code/core/Mage/XmlConnect/controllers/WishlistController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/WishlistController.php
@@ -116,7 +116,7 @@ public function addAction()
         }
 
         try {
-            $item = $wishlist->addNewItem($product->getId());
+            $item = $wishlist->addNewItem($product);
             if (strlen(trim((string)$request->getParam('description')))) {
                 $item->setDescription($request->getParam('description'))
                    ->save();
@@ -206,14 +206,14 @@ public function updateAction()
             $problemsFlag = false;
 
             foreach ($post['description'] as $itemId => $description) {
+                /** @var $item Mage_Wishlist_Model_Item */
                 $item = Mage::getModel('wishlist/item')->load($itemId);
                 $description = (string) $description;
                 if ($item->getWishlistId() != $wishlist->getId()) {
                     continue;
                 }
                 try {
-                    $item->setDescription($description)
-                        ->save();
+                    $item->setDescription($description)->save();
                     $updatedItems++;
                 } catch (Exception $e) {
                     $problemsFlag = true;
diff --git a/app/code/core/Mage/XmlConnect/etc/config.xml b/app/code/core/Mage/XmlConnect/etc/config.xml
index 828febbcc7..6ec84e5bff 100644
--- a/app/code/core/Mage/XmlConnect/etc/config.xml
+++ b/app/code/core/Mage/XmlConnect/etc/config.xml
@@ -192,15 +192,20 @@
                             <more> <icon> <heightMax>35</heightMax> </icon> </more>
                         </tabBar>
                         <body>
+                            <!-- iphone images -->
                             <bannerImage> <width>320</width> <height>230</height> </bannerImage>
-                            <bannerIpadImage> <width>768</width> <height>294</height> </bannerIpadImage>
-                            <bannerAndroidImage> <width>320</width> <height>258</height> </bannerAndroidImage>
-                            <itemBackgroundIcon> <width>90</width> <height>120</height> </itemBackgroundIcon>
                             <backgroundImage> <width>320</width> <height>367</height> </backgroundImage>
+
+                            <!-- ipad images -->
+                            <bannerIpadImage> <width>768</width> <height>294</height> </bannerIpadImage>
                             <backgroundIpadLandscapeImage> <width>1024</width> <height>704</height> </backgroundIpadLandscapeImage>
                             <backgroundIpadPortraitImage> <width>768</width> <height>960</height> </backgroundIpadPortraitImage>
-                            <backgroundAndroidPortraitImage> <width>320</width> <height>410</height> </backgroundAndroidPortraitImage>
-                            <backgroundAndroidLandscapeImage> <width>480</width> <height>250</height> </backgroundAndroidLandscapeImage>
+
+                            <!-- andriod images -->
+                            <bannerAndroidImage> <width>320</width> <height>258</height> </bannerAndroidImage>
+
+                            <!-- images that are the same for all type of devices -->
+                            <itemBackgroundIcon> <width>90</width> <height>120</height> </itemBackgroundIcon>
                             <rowBackgroundIcon> <width>320</width> <height>90</height> </rowBackgroundIcon>
                             <rowAttributeIcon> <widthMax>30</widthMax> <heightMax>90</heightMax> </rowAttributeIcon>
                             <addToCartBackgroundIcon> <width>136</width> <height>28</height> </addToCartBackgroundIcon>
@@ -224,16 +229,38 @@
                         </itemActions>
                     </native>
                     <submit>
-                        <icon> <width>512</width> <height>512</height> </icon>
-                        <loader_image> <width>320</width> <height>460</height> </loader_image>
-                        <logo> <width>57</width> <height>57</height> </logo>
-                        <big_logo> <width>100</width> <height>100</height> </big_logo>
+                        <!-- images that are the same for all type of devices -->
+                        <icon></icon>
+                        <big_logo></big_logo>
+
+                        <!-- iphone images -->
+                        <loader_image></loader_image>
+                        <loader_image_i4></loader_image_i4>
+                        <logo></logo>
+                        <logo_i4></logo_i4>
+                        <big_logo_i4></big_logo_i4>
+
+                        <!-- ipad images -->
+                        <ipad_loader_portrait_image></ipad_loader_portrait_image>
+                        <ipad_loader_landscape_image></ipad_loader_landscape_image>
+                        <ipad_logo></ipad_logo>
+
+                        <!-- andriod images -->
+                        <android_loader_image></android_loader_image>
+                        <android_logo></android_logo>
                     </submit>
                 </interface>
             </default>
             <_320x480>
                 <default>
                     <source>default</source>
+                    <updates>
+                        <u1>
+                            <path>content/product_gallery_big</path>
+                            <function>update</function>
+                            <data>560</data>
+                        </u1>
+                    </updates>
                 </default>
                 <a>
                     <source>default</source>
@@ -265,34 +292,6 @@
                             <function>zoom</function>
                             <data>2.05714</data>
                         </u1>
-<!-- example rules
-                        <u2>
-                            <path>interface/native/body</path>
-                            <function>delete</function>
-                            <data>rowBackgroundIcon</data>
-                        </u2>
-                        <u3>
-                            <path>interface/native/body</path>
-                            <function>delete</function>
-                            <data>rowAttributeIcon</data>
-                        </u3>
-                        <u4>
-                            <path>interface/native/navigationBar</path>
-                            <function>insert</function>
-                            <data>
-                                <big_icon><widthMax>20</widthMax> <heightMax>20</heightMax></big_icon>
-                                <big_icon2><widthMax>20</widthMax> <heightMax>20</heightMax></big_icon2>
-                                <big_icon3><widthMax>20</widthMax> <heightMax>20</heightMax></big_icon3>
-                            </data>
-                        </u4>
-                        <u5>
-                            <path>interface/native/itemActions/viewDetailsIcon</path>
-                            <function>update</function>
-                            <data>
-                                <widthMax>333</widthMax> <heightMax>333</heightMax>
-                            </data>
-                        </u5>
--->
                     </updates>
                 </c>
             </_320x480>
@@ -305,6 +304,11 @@
                             <function>zoom</function>
                             <data>1.5</data>
                         </u1>
+                        <u2>
+                            <path>content/product_gallery_big</path>
+                            <function>update</function>
+                            <data>840</data>
+                        </u2>
                     </updates>
                 </default>
             </_480x800>
@@ -317,6 +321,11 @@
                             <function>zoom</function>
                             <data>1.5</data>
                         </u1>
+                         <u2>
+                            <path>content/product_gallery_big</path>
+                            <function>update</function>
+                            <data>840</data>
+                        </u2>
                     </updates>
                 </default>
             </_480x854>
@@ -329,10 +338,15 @@
                             <function>zoom</function>
                             <data>2.0</data>
                         </u1>
+                        <u2>
+                            <path>content/product_gallery_big</path>
+                            <function>update</function>
+                            <data>1120</data>
+                        </u2>
                     </updates>
                 </default>
             </_640x960>
-            <_1024x768>
+            <_768x1024>
                 <default>
                     <source>default</source>
                     <updates>
@@ -354,15 +368,15 @@
                         <u4>
                             <path>content/product_gallery_big</path>
                             <function>update</function>
-                            <data>644</data>
+                            <data>1288</data>
                         </u4>
                     </updates>
                 </default>
-            </_1024x768>
+            </_768x1024>
         </screen_size>
         <xmlconnect>
             <mobile_application>
-                <magentocommerce_url>www.magentocommerce.com/mobile/activate/</magentocommerce_url>
+                <magentocommerce_url>www.magentocommerce.com/products/index.php/mobile/activate/index/key/</magentocommerce_url>
                 <activation_key_url>http://www.magentocommerce.com/product/mobile</activation_key_url>
                 <resubmission_key_url>http://www.magentocommerce.com/product/mobile#resubmission</resubmission_key_url>
                 <urbanairship_terms_of_service_url>https://go.urbanairship.com/partners/magento/</urbanairship_terms_of_service_url>
@@ -371,6 +385,7 @@
                 <nodes_excluded_from_config_xml>
                     <master_secret>notifications/applicationMasterSecret</master_secret>
                 </nodes_excluded_from_config_xml>
+                <cache_lifetime>86400</cache_lifetime>
             </mobile_application>
             <devices>
                 <iphone>
@@ -383,7 +398,7 @@
                 </ipad>
                 <android>
                     <tab_limit>10</tab_limit>
-                    <notification_type>aps</notification_type>
+                    <notification_type>android</notification_type>
                 </android>
             </devices>
             <flurry_analytics>
@@ -396,6 +411,13 @@
                 <broadcast_url>https://go.urbanairship.com/api/airmail/send/broadcast/</broadcast_url>
             </airmail>
         </xmlconnect>
+        <system>
+            <media_storage_configuration>
+                <allowed_resources>
+                    <xmlconnect_images_folder>xmlconnect</xmlconnect_images_folder>
+                </allowed_resources>
+            </media_storage_configuration>
+        </system>
     </default>
     <crontab>
         <jobs>
diff --git a/app/code/core/Mage/XmlConnect/etc/themes/custom.xml b/app/code/core/Mage/XmlConnect/etc/themes/custom.xml
index 8a7cd4c196..ba83be6f0e 100644
--- a/app/code/core/Mage/XmlConnect/etc/themes/custom.xml
+++ b/app/code/core/Mage/XmlConnect/etc/themes/custom.xml
@@ -26,9 +26,39 @@
  */
 -->
 
-<theme><manifest translate="label" module="xmlconnect">
+<theme>
+    <manifest translate="label" module="xmlconnect">
         <name>custom</name>
         <label>Custom Colors</label>
         <version>1.0</version>
         <requires>1.4.0.2</requires>
-    </manifest><configuration><native><navigationBar><tintColor>#0FDE00</tintColor></navigationBar><body><primaryColor>#0FDE00</primaryColor><secondaryColor>#0FDE00</secondaryColor><backgroundColor>#0FDE00</backgroundColor><scrollBackgroundColor>#0FDE00</scrollBackgroundColor></body><categoryItem><tintColor>#0FDE00</tintColor><backgroundColor>#0FDE00</backgroundColor></categoryItem><itemActions><relatedProductBackgroundColor>#0FDE00</relatedProductBackgroundColor></itemActions></native><extra><fontColors><header>#0FDE00</header><primary>#0FDE00</primary><secondary>#0FDE00</secondary><price>#0FDE00</price></fontColors></extra></configuration></theme>
+    </manifest>
+    <configuration>
+        <native>
+            <navigationBar>
+                <tintColor>#0FDE00</tintColor>
+            </navigationBar>
+            <body>
+                <primaryColor>#0FDE00</primaryColor>
+                <secondaryColor>#0FDE00</secondaryColor>
+                <backgroundColor>#0FDE00</backgroundColor>
+                <scrollBackgroundColor>#0FDE00</scrollBackgroundColor>
+            </body>
+            <categoryItem>
+                <tintColor>#0FDE00</tintColor>
+                <backgroundColor>#0FDE00</backgroundColor>
+            </categoryItem>
+            <itemActions>
+                <relatedProductBackgroundColor>#0FDE00</relatedProductBackgroundColor>
+            </itemActions>
+        </native>
+        <extra>
+            <fontColors>
+                <header>#0FDE00</header>
+                <primary>#0FDE00</primary>
+                <secondary>#0FDE00</secondary>
+                <price>#0FDE00</price>
+            </fontColors>
+        </extra>
+    </configuration>
+</theme>
diff --git a/app/code/core/Mage/XmlConnect/etc/themes/default.xml b/app/code/core/Mage/XmlConnect/etc/themes/default.xml
index 2d9b55d174..cf6adae0cc 100644
--- a/app/code/core/Mage/XmlConnect/etc/themes/default.xml
+++ b/app/code/core/Mage/XmlConnect/etc/themes/default.xml
@@ -27,38 +27,38 @@
 -->
 
 <theme>
-<manifest translate="label" module="xmlconnect">
-        <name>default</name>
-        <label>Default Theme</label>
-        <version>1.0</version>
-        <requires>1.4.0.2</requires>
+    <manifest translate="label" module="xmlconnect">
+            <name>default</name>
+            <label>Default Theme</label>
+            <version>1.0</version>
+            <requires>1.4.0.2</requires>
     </manifest>
-<configuration>
-<native>
-<navigationBar>
-<tintColor>#363D40</tintColor>
-</navigationBar>
-<body>
-<primaryColor>#A8A8A8</primaryColor>
-<secondaryColor>#E76E01</secondaryColor>
-<backgroundColor>#ABABAB</backgroundColor>
-<scrollBackgroundColor>#EDEDED</scrollBackgroundColor>
-</body>
-<categoryItem>
-<tintColor>#D13B00</tintColor>
-<backgroundColor>#F3F3F3</backgroundColor>
-</categoryItem>
-<itemActions>
-<relatedProductBackgroundColor>#F3F3F3</relatedProductBackgroundColor>
-</itemActions>
-</native>
-<extra>
-<fontColors>
-<header>#FFFFFF</header>
-<primary>#222222</primary>
-<secondary>#FFFFFF</secondary>
-<price>#D55000</price>
-</fontColors>
-</extra>
-</configuration>
+    <configuration>
+        <native>
+            <navigationBar>
+                <tintColor>#363D40</tintColor>
+            </navigationBar>
+            <body>
+                <primaryColor>#A8A8A8</primaryColor>
+                <secondaryColor>#E76E01</secondaryColor>
+                <backgroundColor>#ABABAB</backgroundColor>
+                <scrollBackgroundColor>#EDEDED</scrollBackgroundColor>
+            </body>
+            <categoryItem>
+                <tintColor>#D13B00</tintColor>
+                <backgroundColor>#F3F3F3</backgroundColor>
+            </categoryItem>
+            <itemActions>
+                <relatedProductBackgroundColor>#F3F3F3</relatedProductBackgroundColor>
+            </itemActions>
+        </native>
+        <extra>
+            <fontColors>
+                <header>#FFFFFF</header>
+                <primary>#222222</primary>
+                <secondary>#FFFFFF</secondary>
+                <price>#D55000</price>
+            </fontColors>
+        </extra>
+    </configuration>
 </theme>
diff --git a/app/code/core/Mage/XmlConnect/etc/themes/funk_leaf.xml b/app/code/core/Mage/XmlConnect/etc/themes/funk_leaf.xml
index e167c1dd2a..d1dd808745 100644
--- a/app/code/core/Mage/XmlConnect/etc/themes/funk_leaf.xml
+++ b/app/code/core/Mage/XmlConnect/etc/themes/funk_leaf.xml
@@ -27,38 +27,38 @@
 -->
 
 <theme>
-<manifest translate="label" module="xmlconnect">
+    <manifest translate="label" module="xmlconnect">
         <name>funk_leaf</name>
         <label>Funk Leaf</label>
         <version>1.0</version>
         <requires>1.4.0.2</requires>
     </manifest>
-<configuration>
-<native>
-<navigationBar>
-<tintColor>#024800</tintColor>
-</navigationBar>
-<body>
-<primaryColor>#ABABAB</primaryColor>
-<secondaryColor>#7CD500</secondaryColor>
-<backgroundColor>#8CDE9C</backgroundColor>
-<scrollBackgroundColor>#FFFFFF</scrollBackgroundColor>
-</body>
-<categoryItem>
-<tintColor>#566101</tintColor>
-<backgroundColor>#FFFFFF</backgroundColor>
-</categoryItem>
-<itemActions>
-<relatedProductBackgroundColor>#FFFFFF</relatedProductBackgroundColor>
-</itemActions>
-</native>
-<extra>
-<fontColors>
-<header>#FFFFFF</header>
-<primary>#222222</primary>
-<secondary>#3E3F3F</secondary>
-<price>#025600</price>
-</fontColors>
-</extra>
-</configuration>
+    <configuration>
+        <native>
+            <navigationBar>
+                <tintColor>#024800</tintColor>
+            </navigationBar>
+            <body>
+                <primaryColor>#ABABAB</primaryColor>
+                <secondaryColor>#7CD500</secondaryColor>
+                <backgroundColor>#8CDE9C</backgroundColor>
+                <scrollBackgroundColor>#FFFFFF</scrollBackgroundColor>
+            </body>
+            <categoryItem>
+                <tintColor>#566101</tintColor>
+                <backgroundColor>#FFFFFF</backgroundColor>
+            </categoryItem>
+            <itemActions>
+                <relatedProductBackgroundColor>#FFFFFF</relatedProductBackgroundColor>
+            </itemActions>
+        </native>
+        <extra>
+            <fontColors>
+                <header>#FFFFFF</header>
+                <primary>#222222</primary>
+                <secondary>#3E3F3F</secondary>
+                <price>#025600</price>
+            </fontColors>
+        </extra>
+    </configuration>
 </theme>
diff --git a/app/code/core/Mage/XmlConnect/etc/themes/hot_red.xml b/app/code/core/Mage/XmlConnect/etc/themes/hot_red.xml
index 75be7bfc17..3c2f261cc4 100644
--- a/app/code/core/Mage/XmlConnect/etc/themes/hot_red.xml
+++ b/app/code/core/Mage/XmlConnect/etc/themes/hot_red.xml
@@ -27,38 +27,38 @@
 -->
 
 <theme>
-<manifest translate="label" module="xmlconnect">
+    <manifest translate="label" module="xmlconnect">
         <name>hot_red</name>
         <label>Hot Red</label>
         <version>1.0</version>
         <requires>1.4.0.2</requires>
     </manifest>
-<configuration>
-<native>
-<navigationBar>
-<tintColor>#C91E00</tintColor>
-</navigationBar>
-<body>
-<primaryColor>#A8A8A8</primaryColor>
-<secondaryColor>#C92B01</secondaryColor>
-<backgroundColor>#FFFFFF</backgroundColor>
-<scrollBackgroundColor>#FFFFFF</scrollBackgroundColor>
-</body>
-<categoryItem>
-<tintColor>#A32301</tintColor>
-<backgroundColor>#FFFFFF</backgroundColor>
-</categoryItem>
-<itemActions>
-<relatedProductBackgroundColor>#E00000</relatedProductBackgroundColor>
-</itemActions>
-</native>
-<extra>
-<fontColors>
-<header>#FFFFFF</header>
-<primary>#222222</primary>
-<secondary>#FFFFFF</secondary>
-<price>#CA1800</price>
-</fontColors>
-</extra>
-</configuration>
+    <configuration>
+        <native>
+            <navigationBar>
+                <tintColor>#C91E00</tintColor>
+            </navigationBar>
+            <body>
+                <primaryColor>#A8A8A8</primaryColor>
+                <secondaryColor>#C92B01</secondaryColor>
+                <backgroundColor>#FFFFFF</backgroundColor>
+                <scrollBackgroundColor>#FFFFFF</scrollBackgroundColor>
+            </body>
+            <categoryItem>
+                <tintColor>#A32301</tintColor>
+                <backgroundColor>#FFFFFF</backgroundColor>
+            </categoryItem>
+            <itemActions>
+                <relatedProductBackgroundColor>#E00000</relatedProductBackgroundColor>
+            </itemActions>
+        </native>
+    <extra>
+        <fontColors>
+            <header>#FFFFFF</header>
+            <primary>#222222</primary>
+            <secondary>#FFFFFF</secondary>
+            <price>#CA1800</price>
+        </fontColors>
+    </extra>
+    </configuration>
 </theme>
diff --git a/app/code/core/Mage/XmlConnect/etc/themes/sky_blue.xml b/app/code/core/Mage/XmlConnect/etc/themes/sky_blue.xml
index 27dec5ab5f..fe0ff91c9c 100644
--- a/app/code/core/Mage/XmlConnect/etc/themes/sky_blue.xml
+++ b/app/code/core/Mage/XmlConnect/etc/themes/sky_blue.xml
@@ -27,38 +27,38 @@
 -->
 
 <theme>
-<manifest translate="label" module="xmlconnect">
+    <manifest translate="label" module="xmlconnect">
         <name>sky_blue</name>
         <label>Sky Blue</label>
         <version>1.0</version>
         <requires>1.4.0.2</requires>
     </manifest>
-<configuration>
-<native>
-<navigationBar>
-<tintColor>#4B7282</tintColor>
-</navigationBar>
-<body>
-<primaryColor>#ABABAB</primaryColor>
-<secondaryColor>#B7D0DA</secondaryColor>
-<backgroundColor>#FFFFFF</backgroundColor>
-<scrollBackgroundColor>#FFFFFF</scrollBackgroundColor>
-</body>
-<categoryItem>
-<tintColor>#2C434D</tintColor>
-<backgroundColor>#FFFFFF</backgroundColor>
-</categoryItem>
-<itemActions>
-<relatedProductBackgroundColor>#FFFFFF</relatedProductBackgroundColor>
-</itemActions>
-</native>
-<extra>
-<fontColors>
-<header>#FFFFFF</header>
-<primary>#222222</primary>
-<secondary>#FFFFFF</secondary>
-<price>#406474</price>
-</fontColors>
-</extra>
-</configuration>
+    <configuration>
+        <native>
+            <navigationBar>
+                <tintColor>#4B7282</tintColor>
+            </navigationBar>
+            <body>
+                <primaryColor>#ABABAB</primaryColor>
+                <secondaryColor>#B7D0DA</secondaryColor>
+                <backgroundColor>#FFFFFF</backgroundColor>
+                <scrollBackgroundColor>#FFFFFF</scrollBackgroundColor>
+            </body>
+            <categoryItem>
+                <tintColor>#2C434D</tintColor>
+                <backgroundColor>#FFFFFF</backgroundColor>
+            </categoryItem>
+            <itemActions>
+                <relatedProductBackgroundColor>#FFFFFF</relatedProductBackgroundColor>
+            </itemActions>
+        </native>
+        <extra>
+            <fontColors>
+                <header>#FFFFFF</header>
+                <primary>#222222</primary>
+                <secondary>#FFFFFF</secondary>
+                <price>#406474</price>
+            </fontColors>
+        </extra>
+    </configuration>
 </theme>
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.10-1.4.0.11.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.10-1.4.0.11.php
index 31e9cdeb08..0a7e993a80 100755
--- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.10-1.4.0.11.php
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.10-1.4.0.11.php
@@ -27,6 +27,10 @@
 $installer = $this;
 $installer->startSetup();
 
-$installer->getConnection()->addColumn($installer->getTable('xmlconnect/history'), 'name', 'VARCHAR( 255 ) NOT NULL AFTER `activation_key`');
+$installer->getConnection()->addColumn(
+    $installer->getTable('xmlconnect/history'),
+    'name',
+    'VARCHAR( 255 ) NOT NULL AFTER `activation_key`'
+);
 
 $installer->endSetup();
diff --git a/app/design/adminhtml/default/default/layout/xmlconnect.xml b/app/design/adminhtml/default/default/layout/xmlconnect.xml
index e2c0478c7f..47fc4ca9bd 100644
--- a/app/design/adminhtml/default/default/layout/xmlconnect.xml
+++ b/app/design/adminhtml/default/default/layout/xmlconnect.xml
@@ -117,6 +117,8 @@
                 <block type="xmlconnect/adminhtml_mobile_edit_tab_payment" name="mobile_edit_tab_payment"/>
                 <block type="xmlconnect/adminhtml_mobile_edit_tab_flurryanalytics" name="mobile_edit_tab_flurryanalytics"/>
                 <block type="xmlconnect/adminhtml_mobile_edit_tab_submission_history" name="mobile_edit_tab_submission_history_grid"/>
+                <block type="xmlconnect/adminhtml_mobile_edit_tab_cache" name="mobile_edit_tab_cache"/>
+                <block type="xmlconnect/adminhtml_mobile_edit_tab_social" name="mobile_edit_tab_social" />
                 <block type="xmlconnect/adminhtml_mobile_edit_tab_notification" name="mobile_edit_tab_notification">
                     <block type="core/template" name="mobile_edit_tab_notification_helper" as="app_notification_helper" template="xmlconnect/mobile/notification_helper.phtml" />
                 </block>
@@ -127,6 +129,8 @@
                 <action method="addTab"><id>payment_methods</id><block>mobile_edit_tab_payment</block></action>
                 <action method="addTab"><id>flurryanalytics_section</id><block>mobile_edit_tab_flurryanalytics</block></action>
                 <action method="addTab"><id>history_grid</id><block>mobile_edit_tab_submission_history_grid</block></action>
+                <action method="addTab"><id>cache_section</id><block>mobile_edit_tab_cache</block></action>
+                <action method="addTab"><id>social_section</id><block>mobile_edit_tab_social</block></action>
                 <action method="addTab"><id>notification_section</id><block>mobile_edit_tab_notification</block></action>
             </block>
         </reference>
@@ -177,46 +181,56 @@
     </adminhtml_mobile_template_preview>
 
     <adminhtml_mobile_previewhome>
-        <block type="xmlconnect/adminhtml_mobile_preview_content" name="preview_home_content" output="toHtml">
-            <action method="setTemplate"><templateType>home</templateType></action>
-            <block type="xmlconnect/adminhtml_mobile_preview_tabitems" name="preview_tab_items" as="tab_items">
-                <action method="setActiveTab"><tab>home</tab></action>
+        <block type="core/text_list" name="root" output="toHtml">
+            <block type="xmlconnect/adminhtml_mobile_preview_content" name="preview_home_content">
+                <action method="setTemplate"><templateType>home</templateType></action>
+                <block type="xmlconnect/adminhtml_mobile_preview_tabitems" name="preview_tab_items" as="tab_items">
+                    <action method="setActiveTab"><tab>home</tab></action>
+                </block>
             </block>
         </block>
     </adminhtml_mobile_previewhome>
 
     <adminhtml_mobile_previewhomehor>
-        <block type="xmlconnect/adminhtml_mobile_preview_content" name="preview_home_hor_content" output="toHtml">
-            <action method="setTemplate"><templateType>home_hor</templateType></action>
-            <block type="xmlconnect/adminhtml_mobile_preview_tabitems" name="preview_tab_items" as="tab_items">
-                <action method="setActiveTab"><tab>home</tab></action>
+        <block type="core/text_list" name="root" output="toHtml">
+            <block type="xmlconnect/adminhtml_mobile_preview_content" name="preview_home_hor_content">
+                <action method="setTemplate"><templateType>home_hor</templateType></action>
+                <block type="xmlconnect/adminhtml_mobile_preview_tabitems" name="preview_tab_items" as="tab_items">
+                    <action method="setActiveTab"><tab>home</tab></action>
+                </block>
             </block>
         </block>
     </adminhtml_mobile_previewhomehor>
 
     <adminhtml_mobile_previewcataloghor>
-        <block type="xmlconnect/adminhtml_mobile_preview_content" name="preview_catalog_hor_content" output="toHtml">
-            <action method="setTemplate"><templateType>catalog_hor</templateType></action>
-            <block type="xmlconnect/adminhtml_mobile_preview_tabitems" name="preview_tab_items" as="tab_items">
-                <action method="setActiveTab"><tab>shop</tab></action>
+        <block type="core/text_list" name="root" output="toHtml">
+            <block type="xmlconnect/adminhtml_mobile_preview_content" name="preview_catalog_hor_content">
+                <action method="setTemplate"><templateType>catalog_hor</templateType></action>
+                <block type="xmlconnect/adminhtml_mobile_preview_tabitems" name="preview_tab_items" as="tab_items">
+                    <action method="setActiveTab"><tab>shop</tab></action>
+                </block>
             </block>
         </block>
     </adminhtml_mobile_previewcataloghor>
 
     <adminhtml_mobile_previewcatalog>
-        <block type="xmlconnect/adminhtml_mobile_preview_content" name="preview_catalog_content" output="toHtml">
-            <action method="setTemplate"><templateType>catalog</templateType></action>
-            <block type="xmlconnect/adminhtml_mobile_preview_tabitems" name="preview_tab_items" as="tab_items">
-                <action method="setActiveTab"><tab>shop</tab></action>
+        <block type="core/text_list" name="root" output="toHtml">
+            <block type="xmlconnect/adminhtml_mobile_preview_content" name="preview_catalog_content">
+                <action method="setTemplate"><templateType>catalog</templateType></action>
+                <block type="xmlconnect/adminhtml_mobile_preview_tabitems" name="preview_tab_items" as="tab_items">
+                    <action method="setActiveTab"><tab>shop</tab></action>
+                </block>
             </block>
         </block>
     </adminhtml_mobile_previewcatalog>
 
     <adminhtml_mobile_previewproductinfo>
-        <block type="xmlconnect/adminhtml_mobile_preview_content" name="preview_productinfo_content" output="toHtml">
-            <action method="setTemplate"><templateType>productinfo</templateType></action>
-            <block type="xmlconnect/adminhtml_mobile_preview_tabitems" name="preview_tab_items" as="tab_items">
-                <action method="setActiveTab"><tab>shop</tab></action>
+        <block type="core/text_list" name="root" output="toHtml">
+            <block type="xmlconnect/adminhtml_mobile_preview_content" name="preview_productinfo_content">
+                <action method="setTemplate"><templateType>productinfo</templateType></action>
+                <block type="xmlconnect/adminhtml_mobile_preview_tabitems" name="preview_tab_items" as="tab_items">
+                    <action method="setActiveTab"><tab>shop</tab></action>
+                </block>
             </block>
         </block>
     </adminhtml_mobile_previewproductinfo>
diff --git a/app/design/adminhtml/default/default/template/catalog/product/price.phtml b/app/design/adminhtml/default/default/template/catalog/product/price.phtml
index 164ba7a70b..58dd3dd761 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/price.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/price.phtml
@@ -33,8 +33,11 @@
  */
 ?>
 <?php
+    /** @var $_coreHelper Mage_Core_Helper_Data */
     $_coreHelper        = $this->helper('core');
+    /** @var $_weeeHelper Mage_Weee_Helper_Data */
     $_weeeHelper        = $this->helper('weee');
+    /** @var $_taxHelper Mage_Tax_Helper_Data */
     $_taxHelper         = $this->helper('tax');
 
     $_product           = $this->getProduct();
@@ -56,7 +59,7 @@ $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, $includingTax
 <?php $_weeeTaxAmount = $_weeeHelper->getAmount($_product, null, null, $_website); ?>
 <?php if ($_weeeHelper->typeOfDisplay($_product, array(1,2,4))): ?>
     <?php $_weeeTaxAmount = $_weeeHelper->getAmount($_product, null, null, $_website); ?>
-    <?php $_weeeTaxAttributes = $_weeeHelper->getProductWeeeAttributesForDisplay($_product); ?>
+    <?php $_weeeTaxAttributes = $_weeeHelper->getProductWeeeAttributesForRenderer($_product, null, null, $_website); ?>
 <?php endif; ?>
 
 <div class="price-box">
diff --git a/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml b/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
index 87b17d8f5f..3566bc284d 100644
--- a/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
+++ b/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
@@ -70,11 +70,13 @@
             <?php foreach ($addressCollection as $_address): ?>
             <div id="form_address_item_<?php echo $_address->getId() ?>" style="display:none">
             <?php
-                    $this->getFormObject()->setValues($_address->getData())
+                    $this->getForm()->setValues($_address->getData())
                             ->setHtmlIdPrefix("_item{$_address->getId()}")
-                            ->setFieldNameSuffix('address['.$_address->getId().']')
+                            ->setFieldNameSuffix('address['.$_address->getId().']');
+                    $this->addValuesToNamePrefixElement($_address->getPrefix())
+                        ->addValuesToNameSuffixElement($_address->getSuffix());
             ?>
-            <?php echo $this->getFormObject()->getHtml() ?>
+            <?php echo $this->getForm()->getHtml() ?>
             <input type="hidden" name="address[<?php echo $_address->getId() ?>][_deleted]" id="deleted_address_item_<?php echo $_address->getId() ?>" />
             </div>
             <?php endforeach; ?>
diff --git a/app/design/adminhtml/default/default/template/example.phtml b/app/design/adminhtml/default/default/template/example.phtml
index 73f23495b1..033464bb72 100644
--- a/app/design/adminhtml/default/default/template/example.phtml
+++ b/app/design/adminhtml/default/default/template/example.phtml
@@ -27,6 +27,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html lang="en">
         <head>
+            <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
             <title><?php echo Mage::helper('adminhtml')->__('Magento Commerce - Administrative Panel') ?></title>
             <style type="text/css" media="all">
                 /*<![CDATA[*/ @import "<?php echo $this->getSkinUrl('styles.css') ?>"; /*]]>*/
diff --git a/app/design/adminhtml/default/default/template/forgotpassword.phtml b/app/design/adminhtml/default/default/template/forgotpassword.phtml
index ac3205ded9..38726115bb 100644
--- a/app/design/adminhtml/default/default/template/forgotpassword.phtml
+++ b/app/design/adminhtml/default/default/template/forgotpassword.phtml
@@ -27,14 +27,10 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html lang="en">
 <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title><?php echo Mage::helper('adminhtml')->__('Log into Magento Admin Page') ?></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" ></meta>
-    <style type="text/css" media="all">
-        /*<![CDATA[*/ @import "<?php echo $this->getSkinUrl('styles.css') ?>"; /*]]>*/
-    </style>
     <link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('reset.css') ?>" media="all" />
     <link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('boxes.css') ?>" media="all" />
-    <link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('widgets.css') ?>" media="all" />
     <link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
     <link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
 
diff --git a/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml b/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml
index a88d1ecea6..b4fa61f6f8 100644
--- a/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml
+++ b/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml
@@ -33,7 +33,8 @@
 
         <?php if ($this->getMessageText()): ?>
         <div class="gift-options-tooltip-content">
-            <strong><?php echo $this->helper('giftmessage')->__('Gift Message')?></strong>: <?php echo $this->getMessageText(); ?>
+            <div><strong><?php echo $this->helper('giftmessage')->__('Gift Message')?></strong>:</div>
+            <div><?php echo $this->getMessageText(); ?></div>
         </div>
         <?php endif; ?>
     </div>
diff --git a/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml b/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml
index c96a42899c..60ecb4d7fb 100644
--- a/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml
+++ b/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml
@@ -36,7 +36,8 @@
 
     <?php if ($this->getMessageText()): ?>
     <div class="gift-options-tooltip-content">
-        <strong><?php echo $this->helper('giftmessage')->__('Gift Message')?></strong>: <?php echo $this->getMessageText() ?>
+        <div><strong><?php echo $this->helper('giftmessage')->__('Gift Message')?></strong>: </div>
+        <div><?php echo $this->getMessageText() ?></div>
     </div>
     <?php endif; ?>
 </div>
diff --git a/app/design/adminhtml/default/default/template/login.phtml b/app/design/adminhtml/default/default/template/login.phtml
index 549df718b3..18f0b59360 100644
--- a/app/design/adminhtml/default/default/template/login.phtml
+++ b/app/design/adminhtml/default/default/template/login.phtml
@@ -27,8 +27,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html lang="en">
 <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title><?php echo Mage::helper('adminhtml')->__('Log into Magento Admin Page') ?></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" ></meta>
     <link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('reset.css') ?>" media="all" />
     <link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('boxes.css') ?>" media="all" />
     <link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
diff --git a/app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml b/app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml
index df7f6f8fa2..4c0b832c8a 100644
--- a/app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml
+++ b/app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml
@@ -27,8 +27,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html lang="en">
 <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title><?php echo Mage::helper('newsletter')->__('Newsletter Message Preview'); ?></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />    
 </head>
 <body>
     <?php echo $this->getChildHtml('content') ?>
diff --git a/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml b/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml
index df7f6f8fa2..4c0b832c8a 100644
--- a/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml
+++ b/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml
@@ -27,8 +27,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html lang="en">
 <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title><?php echo Mage::helper('newsletter')->__('Newsletter Message Preview'); ?></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />    
 </head>
 <body>
     <?php echo $this->getChildHtml('content') ?>
diff --git a/app/design/adminhtml/default/default/template/page/head.phtml b/app/design/adminhtml/default/default/template/page/head.phtml
index 744adf3ae3..c190c099f5 100644
--- a/app/design/adminhtml/default/default/template/page/head.phtml
+++ b/app/design/adminhtml/default/default/template/page/head.phtml
@@ -1,5 +1,5 @@
-<title><?php echo htmlspecialchars(html_entity_decode($this->getTitle())) ?></title>
 <meta http-equiv="Content-Type" content="<?php echo $this->getContentType() ?>"/>
+<title><?php echo htmlspecialchars(html_entity_decode($this->getTitle())) ?></title>
 
 <link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon"/>
 <link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon"/>
diff --git a/app/design/adminhtml/default/default/template/page/header.phtml b/app/design/adminhtml/default/default/template/page/header.phtml
index 0cd9fbb34e..3c57926f5c 100644
--- a/app/design/adminhtml/default/default/template/page/header.phtml
+++ b/app/design/adminhtml/default/default/template/page/header.phtml
@@ -23,12 +23,14 @@
  * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var $this Mage_Adminhtml_Block_Page_Header */
 ?>
 <div class="header-top">
     <a href="<?php echo $this->getHomeLink() ?>"><img src="<?php echo $this->getSkinUrl($this->__('images/logo.gif')) ?>" alt="<?php echo $this->__('Magento Logo') ?>" class="logo"/></a>
     <div class="header-right">
         <p class="super">
-            <?php echo $this->__("Logged in as %s", $this->getUser()->getUsername()) ?><span class="separator">|</span><?php echo $this->formatDate(null, 'full') ?><span class="separator">|</span><a href="http://golinks.magento.com/CE15" onclick="this.target='_blank'" class="go-try"><?php echo $this->__('Try Magento Go for Free') ?></a><span class="separator">|</span><a href="<?php echo $this->getLogoutLink() ?>" class="link-logout"><?php echo $this->__('Log Out') ?></a>
+            <?php echo $this->__("Logged in as %s", $this->escapeHtml($this->getUser()->getUsername())) ?><span class="separator">|</span><?php echo $this->formatDate(null, 'full') ?><span class="separator">|</span><a href="http://golinks.magento.com/CE15" onclick="this.target='_blank'" class="go-try"><?php echo $this->__('Try Magento Go for Free') ?></a><span class="separator">|</span><a href="<?php echo $this->getLogoutLink() ?>" class="link-logout"><?php echo $this->__('Log Out') ?></a>
         </p>
         <?php if ( Mage::getSingleton('admin/session')->isAllowed('admin/global_search') ): ?>
         <fieldset>
diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/global.phtml b/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/global.phtml
index 87ff4b046a..8a5529b85b 100644
--- a/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/global.phtml
+++ b/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/global.phtml
@@ -46,14 +46,14 @@
                 <?php if ($this->hasInheritElement($element)): ?>
                     <div><?php echo $this->getInheritElementHtml($element) ?><?php echo $this->getInheritElementLabelHtml($element) ?></div>
                 <?php endif;?>
-                <label for="<?php echo $htmlId?>"><?php echo $this->getElementHtml($element) ?><strong><?php echo $this->escapeHtml($this->getElementLabel($element))?></strong>&nbsp;&ndash; <?php echo $this->escapeHtml($this->getElementComment($element))?></label>
+                <label for="<?php echo $htmlId?>"><?php echo $this->getElementHtml($element) ?><strong><?php echo $this->getElementLabelTextHtml($element)?></strong>&nbsp;&ndash; <?php echo $this->escapeHtml($this->getElementComment($element))?></label>
             </td>
         <?php else:?>
             <td>
                 <?php if ($this->hasInheritElement($element)): ?>
                     <div><?php echo $this->getInheritElementHtml($element) ?><?php echo $this->getInheritElementLabelHtml($element) ?></div>
                 <?php endif;?>
-                <label for="<?php echo $htmlId?>"><?php echo $this->getElementHtml($element) ?><strong><?php echo $this->escapeHtml($this->getElementLabel($element))?></strong>&nbsp;&ndash; <?php echo $this->escapeHtml($this->getElementComment($element))?></label>
+                <label for="<?php echo $htmlId?>"><?php echo $this->getElementHtml($element) ?><strong><?php echo $this->getElementLabelTextHtml($element)?></strong>&nbsp;&ndash; <?php echo $this->getElementComment($element)?></label>
             </td>
             <td class="paypal-selection-info">
                 <?php if ($url = $this->getElementOriginalData($element, 'demo_url')):?>
@@ -103,14 +103,62 @@ PaypalConfig = Class.create();
 PaypalConfig.prototype = {
     initialize: function(){
         this.methods = $H({
-            ec: $H({switcher: 'express', fieldset: 'express'}),
-            wps: $H({switcher: 'wps', fieldset: 'wps'}),
-            wpp: $H({switcher: 'wpp', fieldset: 'wpp'}),
-            wpppe: $H({switcher: 'wpp_pe', fieldset: 'wpp_pe'}),
-            wpppl: $H({switcher: 'payflow_link', fieldset: 'payflow_link'}),
-            ecpe: $H({switcher: 'express_pe', fieldset: 'express_pe'}),
-            payflowpro: $H({switcher: 'verisign', fieldset: 'verisign'}),
-            hosted_pro: $H({switcher: 'hosted_pro', fieldset: 'hosted_pro'})
+                ec: $H({
+                    switcher: 'express',
+                    fieldset: 'express',
+                    backendConfig : $H(<?php echo $this->getElementBackendConfig(
+                        $this->getElement('paypal_global_express'));
+                    ?>)
+                }),
+                wps: $H({
+                    switcher: 'wps',
+                    fieldset: 'wps',
+                    backendConfig : $H(<?php echo $this->getElementBackendConfig(
+                        $this->getElement('paypal_global_wps'));
+                    ?>)
+                }),
+                wpp: $H({
+                    switcher: 'wpp',
+                    fieldset: 'wpp',
+                    backendConfig : $H(<?php echo $this->getElementBackendConfig(
+                        $this->getElement('paypal_global_wpp'));
+                    ?>)
+                }),
+                wpppe: $H({
+                    switcher: 'wpp_pe',
+                    fieldset: 'wpp_pe',
+                    backendConfig : $H(<?php echo $this->getElementBackendConfig(
+                        $this->getElement('paypal_global_wpp_pe'));
+                    ?>)
+                }),
+                wpppl: $H({
+                    switcher: 'payflow_link',
+                    fieldset: 'payflow_link',
+                    backendConfig : $H(<?php echo $this->getElementBackendConfig(
+                        $this->getElement('paypal_global_payflow_link'));
+                    ?>)
+                }),
+                ecpe: $H({
+                    switcher: 'express_pe',
+                    fieldset: 'express_pe',
+                    backendConfig : $H(<?php echo $this->getElementBackendConfig(
+                        $this->getElement('paypal_global_express_pe'));
+                    ?>)
+                }),
+                payflowpro: $H({
+                    switcher: 'verisign',
+                    fieldset: 'verisign',
+                    backendConfig : $H(<?php echo $this->getElementBackendConfig(
+                        $this->getElement('paypal_global_verisign'));
+                    ?>)
+                }),
+                hosted_pro: $H({
+                    switcher: 'hosted_pro',
+                    fieldset: 'hosted_pro',
+                    backendConfig : $H(<?php echo $this->getElementBackendConfig(
+                        $this->getElement('paypal_global_hosted_pro'));
+                    ?>)
+                })
         });
         this.disabledMethods = [];
     },
@@ -144,6 +192,12 @@ PaypalConfig.prototype = {
         return $(fieldsetId);
     },
 
+    getMethodFieldsetHeadingLink: function(fieldset)
+    {
+        var heading = fieldset.previous('div');
+        return heading.down('a');
+    },
+
     getMethodSwitcher: function(method)
     {
         var switcherId = 'paypal_global_' + this.getMethod(method).get('switcher');
@@ -156,6 +210,12 @@ PaypalConfig.prototype = {
         return $(switcherValueId);
     },
 
+    getMethodSwitcherLabelText: function(method)
+    {
+        var switcherValueId = 'paypal_global_' + this.getMethod(method).get('switcher') + '_label_text';
+        return $(switcherValueId);
+    },
+
     getMethodSwitcherInherit: function(method)
     {
         var inheritId = 'paypal_global_' + this.getMethod(method).get('switcher') + '_inherit';
@@ -253,45 +313,9 @@ PaypalConfig.prototype = {
 
     trackMerchantCountry: function()
     {
-        var countryConfig = $H({
-            'US':{
-                'exclude_methods': ['hosted_pro']
-            },
-            'CA':{
-                'exclude_methods': ['wpppe','ecpe','hosted_pro']
-            },
-            'GB':{
-                'exclude_methods': ['payflowpro','wpppl']
-            },
-            'AU':{
-                'exclude_methods': ['wpp','wpppe','ecpe','wpppl']
-            },
-            'NZ':{
-                'exclude_methods': ['wpp','wpppe','ecpe','wpppl']
-            },
-            'DE':{
-                'exclude_methods': ['wpp','wpppe','ecpe','payflowpro','wpppl']
-            },
-            'other':{
-                'exclude_methods': ['wpp','wpppe','ecpe','payflowpro','wpppl']
-            }
-        });
-        var country = $('paypal_account_merchant_country').value;
-        var config = countryConfig.get(country);
-        if (!config) {
-            config = countryConfig.get('other');
-        }
-
-        var excludeMethods = config.exclude_methods;
-        this.disabledMethods = excludeMethods;
-        this.getMethods().keys().each(function(m) {
-            if (excludeMethods.indexOf(m) != -1) {
-                this.disableMethod(m);
-                this.hideMethod(m);
-            } else {
-                this.showMethod(m);
-                this.markMethodAsReadonly(m, false);
-            }
+        this.disabledMethods = [];
+        this.getMethods().keys().each(function(methodKey) {
+            this.applyMethodConfig(methodKey);
         }.bind(this));
 
         this.trackBusinessAccount();
@@ -300,6 +324,55 @@ PaypalConfig.prototype = {
         this.trackWps();
     },
 
+    applyMethodConfig: function(methodKey)
+    {
+        var country = $('paypal_account_merchant_country').value;
+        var config = this.getMethod(methodKey).get('backendConfig');
+        if (!config) {
+            return false;
+        }
+
+        var isMethodEnable = false;
+        var enableForCountries = config.get('enable_for_countries');
+        var disableForCountries = config.get('disable_for_countries');
+        var labels = config.get('labels');
+
+        if (enableForCountries
+            && (enableForCountries.indexOf(country) > -1 || enableForCountries.indexOf('all') > -1)) {
+            isMethodEnable = true;
+        }
+        if (disableForCountries
+            && (disableForCountries.indexOf(country) > -1 || disableForCountries.indexOf('all') > -1)) {
+            isMethodEnable = false;
+        }
+
+        if (isMethodEnable) {
+            this.showMethod(methodKey);
+            this.markMethodAsReadonly(methodKey, false);
+        } else {
+            this.disableMethod(methodKey);
+            this.disabledMethods.push(methodKey);
+            this.hideMethod(methodKey);
+        }
+
+        if (labels) {
+            var switcherLabelElement = this.getMethodSwitcherLabelText(methodKey);
+            var fieldsetLabelElement = this.getMethodFieldsetHeadingLink(this.getMethodFieldset(methodKey));
+            if (!labels['default']) {
+                labels['default'] = {
+                    switcher: switcherLabelElement.innerHTML,
+                    fieldset: fieldsetLabelElement.innerHTML
+                };
+            }
+            var labelConfig = labels[country];
+            if (!labelConfig) {
+                labelConfig = labels['default'];
+            }
+            switcherLabelElement.update(labelConfig['switcher']);
+            fieldsetLabelElement.update(labelConfig['fieldset']);
+        }
+    },
+
     trackBusinessAccount: function()
     {
         var elem = $('paypal_account_business_account');
@@ -415,7 +488,7 @@ PaypalConfig.prototype = {
         this.toggleValueElements(checkbox, fieldset, isHidden);
         isHidden ? fieldset.hide() : fieldset.show();
         var heading = fieldset.previous('div');
-        var headingLink = heading.down('a');
+        var headingLink = this.getMethodFieldsetHeadingLink(fieldset);
         isHidden ? heading.addClassName('disabled').addClassName('no-display') : heading.removeClassName('disabled').removeClassName('no-display');
         if (isHidden) {
             headingLink.oldHref = headingLink.href;
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/data.phtml b/app/design/adminhtml/default/default/template/sales/order/create/data.phtml
index d2c0926999..846503f139 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/data.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/data.phtml
@@ -62,6 +62,7 @@
         </div>
         <?php endif; ?>
 
+        <div class="clear"></div>
         <?php echo $this->getChildHtml('gift_options') ?>
 
         <div class="clear"></div>
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml b/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml
index 8e6583e63c..7d707ee86c 100644
--- a/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml
@@ -431,14 +431,18 @@
      */
     function getGiftOptionsTooltipContent(itemId) {
         var contentLines = [];
+        var headerLine = null;
         var contentLine = null;
 
         $$('#gift_options_data_' + itemId + ' .gift-options-tooltip-content').each(function (element) {
-            contentLine = element.innerHTML;
-            if (contentLine.length > 70) {
-                contentLine = contentLine.slice(0,67) + '...';
+            if (element.down(0)) {
+                headerLine = element.down(0).innerHTML;
+                contentLine = element.down(0).next().innerHTML;
+                if (contentLine.length > 30) {
+                    contentLine = contentLine.slice(0,30) + '...';
+                }
+                contentLines.push(headerLine + ' ' + contentLine);
             }
-            contentLines.push(contentLine);
         });
         return contentLines.join('<br/>');
     }
diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml
index 2ad8b97f80..4dfcc9fafa 100644
--- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml
@@ -73,7 +73,9 @@
 
     function unblockSubmit(id) {
         $(id).observe('focus', function(event) {
-            enableElements('submit-button');
+            if ($$('button[class="scalable update-button disabled"]').size() > 0) {
+                enableElements('submit-button');
+            }
         });
     }
     //]]>
diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml
index 3445861c7f..4326b4ee89 100644
--- a/app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml
@@ -23,11 +23,13 @@
  * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+/** @var $this Mage_Adminhtml_Block_Sales_Order_Totals_Tax */
 ?>
 <?php
-    $_source    = $this->getSource();
-    $_order     = $this->getOrder();
-    $_fullInfo  = $this->getFullTaxInfo();
+/** @var $_source Mage_Sales_Model_Order_Invoice */
+$_source    = $this->getSource();
+$_order     = $this->getOrder();
+$_fullInfo  = $this->getFullTaxInfo();
 ?>
 
 <?php if ($this->displayFullSummary()): ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml b/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml
index 67c2d5ef94..1e3c72d342 100644
--- a/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml
@@ -114,14 +114,18 @@
      */
     function getGiftOptionsTooltipContent(itemId) {
         var contentLines = [];
+        var headerLine = null;
         var contentLine = null;
 
         $$('#gift_options_data_' + itemId + ' .gift-options-tooltip-content').each(function (element) {
-            contentLine = element.innerHTML;
-            if (contentLine.length > 70) {
-                contentLine = contentLine.slice(0,67) + '...';
+            if (element.down(0)) {
+                headerLine = element.down(0).innerHTML;
+                contentLine = element.down(0).next().innerHTML;
+                if (contentLine.length > 30) {
+                    contentLine = contentLine.slice(0,30) + '...';
+                }
+                contentLines.push(headerLine + ' ' + contentLine);
             }
-            contentLines.push(contentLine);
         });
         return contentLines.join('<br/>');
     }
diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml b/app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml
index f8252964b0..bc7631c5ce 100644
--- a/app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml
+++ b/app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml
@@ -278,7 +278,7 @@ Event.observe(window, 'load', function(){
                 <span class="with-tip">
                     <input class="input-text" id="file_path" name="gui_data[file][path]" value="<?php echo $this->getValue('gui_data/file/path') ?>"/>
                     <small class="file_type_file">
-                        <?php echo $this->__('(Absolute path or Relative to Magento install root, ex. var/export)') ?>
+                        <?php echo $this->__('(For Type "Local Server" need to use relative path to Magento install var/export or var/import, e.g. var/export, var/import, var/export/some/dir, var/import/some/dir)') ?>
                     </small>
                 </span>
             </span>
@@ -293,7 +293,14 @@ Event.observe(window, 'load', function(){
                 </span>
                 <span class="field-row">
                     <label for="file_password"><?php echo $this->__("Password") ?></label>
-                    <input class="input-text" id="io_password" name="gui_data[file][password]" value="<?php echo $this->getValue('gui_data/file/password') ?>"/>
+                    <input class="input-text" type="password" id="io_password" name="gui_data[file][password]" value="<?php echo $this->getValue('gui_data/file/password') ?>"/>
+                </span>
+                <span class="field-row">
+                    <label for="file_mode"><?php echo $this->__("File mode") ?></label>
+                    <select id="file_mode" name="gui_data[file][file_mode]" onchange="showOption(this)" class="option-control">
+                        <option value="<?php echo FTP_BINARY ?>" <?php echo $this->getSelected('gui_data/file/file_mode', FTP_BINARY) ?>><?php echo $this->__('BINARY') ?></option>
+                        <option value="<?php echo FTP_ASCII ?>" <?php echo $this->getSelected('gui_data/file/file_mode', FTP_ASCII) ?>><?php echo $this->__('ASCII') ?></option>
+                    </select>
                 </span>
                 <span class="field-row">
                     <label for="file_passive"><?php echo $this->__("Passive mode") ?></label>
diff --git a/app/design/adminhtml/default/default/template/system/email/template/preview.phtml b/app/design/adminhtml/default/default/template/system/email/template/preview.phtml
index 6a12508f15..8b91968138 100644
--- a/app/design/adminhtml/default/default/template/system/email/template/preview.phtml
+++ b/app/design/adminhtml/default/default/template/system/email/template/preview.phtml
@@ -27,8 +27,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html lang="en">
 <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title><?php echo $this->__('Email Preview'); ?></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />    
 </head>
 <body>
     <?php echo $this->getChildHtml('content') ?>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design.phtml
index 73b5162d5d..3e1ac62360 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design.phtml
@@ -24,22 +24,11 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php
-/*
-<div style="padding: 1.5em; margin: 0 0 1em 0; background-color:#E7EFEF; border:1px solid #BEBEBE">
-    <?php echo $this->__('Select Template'); ?>:
-    <select style="width: 15em; margin: 0 2em">
-        <option><?php echo $this->__('Template Name'); ?></option>
-    </select>
-    <a href="#"><?php echo $this->__('Add More Templates'); ?></a>
-</div>
-*/
-?>
 <table border="0" cellspacing="0" cellpadding="0">
     <tr>
-        <td valign="top" width="540px"><?php echo $this->getChildHtml('design_accordion'); ?></td>
-        <td width="20px"> </td>
-        <td valign="top" width="360px">
+        <td style="width:540px"><?php echo $this->getChildHtml('design_accordion'); ?></td>
+        <td style="width:20px">&nbsp;</td>
+        <td style="width:350px">
             <?php if ($this->canShowPreview()) : ?>
                 <?php echo $this->getChildHtml('app_preview') ?>
             <?php endif; ?>
@@ -48,6 +37,6 @@
 </table>
 <script type="text/javascript">
 // <![CDATA[
-jscolor.dir = '<?php echo $this->getJsUrl(); ?>/jscolor/';
+jscolor.dir = '<?php echo $this->getJsUrl(); ?>jscolor/';
 // ]]>
 </script>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog.phtml
deleted file mode 100644
index 9052610217..0000000000
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog.phtml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     default_default
- * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-$title1size = $this->getConfigFontInfo('Title1/size');
-$title1name = $this->getConfigFontInfo('Title1/name');
-$title1color = $this->getConfigFontInfo('Title1/color');
-
-$title2name = $this->getConfigFontInfo('Title2/name');
-$title2size = $this->getConfigFontInfo('Title2/size');
-$title2color = $this->getConfigFontInfo('Title2/color');
-
-$title3size = $this->getConfigFontInfo('Title3/size');
-$title3name = $this->getConfigFontInfo('Title3/name');
-$title3color = $this->getConfigFontInfo('Title3/color');
-
-$title5name = $this->getConfigFontInfo('Title5/name');
-$title5size = $this->getConfigFontInfo('Title5/size');
-$title5color = $this->getConfigFontInfo('Title5/color');
-
-$title8name = $this->getConfigFontInfo('Title8/name');
-$title8size = $this->getConfigFontInfo('Title8/size');
-$title8color = $this->getConfigFontInfo('Title8/color');
-
-$text2name = $this->getConfigFontInfo('Text2/name');
-$text2size = $this->getConfigFontInfo('Text2/size');
-$text2color = $this->getConfigFontInfo('Text2/color');
-
-$naviBarTintColor = $this->getData('conf/navigationBar/tintColor');
-$primaryColor = $this->getData('conf/body/primaryColor');
-$secondaryColor = $this->getData('conf/body/secondaryColor');
-
-$activeStartImage = $this->getPreviewImagesUrl('star-active.png');
-$inactiveStartImage = $this->getPreviewImagesUrl('star-inactive.png');
-$productImage = $this->getPreviewImagesUrl('t-shirt.png');
-?>
-<link rel="stylesheet" type="text/css" href="<?php echo $this->getPreviewCssUrl('mobile-catalog.css'); ?>" media="all" />
-<div class="main-frame">
-<div class="main-block" style="background: #000;">
-    <div class="top-header" style="background: #000;">
-        <div class="volume" style="background:url('<?php echo $this->getPreviewImagesUrl('1.gif'); ?>') bottom left no-repeat;"></div>
-        <div class="header-sign-1"><?php echo $this->__("Carrier"); ?></div>
-        <div class="antenna" style="background:url('<?php echo $this->getPreviewImagesUrl('3.gif'); ?>') bottom right no-repeat;"></div>
-        <div class="time"><?php if($this->getData('conf/Time')): ?><?php echo $this->getData('conf/Time'); ?><?php else: ?><?php echo $this->__("10:40 AM"); ?><?php endif; ?></div>
-        <div class="battery" style="background:url('<?php echo $this->getPreviewImagesUrl('2.gif'); ?>') bottom right no-repeat;"></div>
-    </div>
-    <div class="main-header"  style="background:<?php echo $naviBarTintColor; ?>;color:#f3f3f3;">
-        <div class="gradient">
-            <table class="header-buttons">
-                <tr>
-                    <td class="info">
-                        <div class="login-btn back-button">
-                            <div class="login-left-alt"></div>
-                            <div class="login-body"><span><?php echo $this->__('Back'); ?></span></div>
-                            <div class="login-right"></div>
-                        </div>
-                    </td>
-                    <td class="logo-small"><div>
-                        <img src="<?php echo $this->getLogoUrl(); ?>"/>
-                        <span class="sh-title">
-                            <span class="sh-title1" style="font:bold <?php echo $title1size; ?>px <?php echo $title1name; ?>;">
-                                <span class="sh-title2" style="color: <?php echo $title1color; ?>;"><?php echo $this->__("T-Shirts"); ?></span>
-                        <?php echo $this->__("T-Shirts"); ?>
-                    </span>
-                </span>
-                    </div></td>
-                    <td class="info"><div class="login-btn edit-filter">
-
-<!--                    <td class="login-btn edit-filter">-->
-            <div class="login-left"></div>
-            <div class="login-body"><span><?php echo $this->__('Edit Filter'); ?></span></div>
-            <div class="login-right"></div>
-                    </div></td>
-                    <td class="info"><div class="login-btn edit-filter">
-                        <div class="login-left"></div>
-                        <div class="login-body"><span><?php echo $this->__('Edit Filter'); ?></span></div>
-                        <div class="login-right"></div>
-                    </div></td>
-                </tr>
-            </table>
-        </div>
-    </div>
-    <div class="filter-header" style="background:<?php echo $naviBarTintColor; ?>;">
-        <div class="gradient"></div>
-        <div style="background: url('<?php echo $this->getData('conf/appliedFilters/backgroundImage'); ?>') center center no-repeat; width: 320px;height: 100%;">
-            <div class="filter-lines">&nbsp;</div>
-            <div class="filter-applied">
-                <span class="filter-circle">3</span>
-                <span class="filter-text"><?php echo $this->__('FILTERS APPLIED'); ?></span>
-            </div>
-        </div>
-    </div>
-    <div class="sort-block" style="background:<?php echo $primaryColor; ?>;">
-        <div class="sort-block-inner">
-            <div class="sort-block-inner-txt" style="font:bold <?php echo $title3size; ?>px <?php echo $title3name; ?>; color: <?php echo $title3color; ?>;"><?php echo $this->__('SORT BY:'); ?></div>
-            <div class="buttons-holder">
-                <span class="button button-pos" style="background-color:<?php echo $secondaryColor; ?>">Position<img src="<?php echo $this->getPreviewImagesUrl('sort_buttons/button_up.gif');?>" alt="" /></span>
-                <span class="button button-name">Name</span>
-                <span class="button button-price">Price</span>
-            </div>
-        </div>
-    </div>
-    <div class="items-list" style="background: <?php echo $this->getData('conf/body/backgroundColor'); ?>">
-        <div class="item" style="background:<?php echo $primaryColor; ?>;">
-            <div class="gradient"></div>
-            <div class="item-image"><img width="72" height="72" src="<?php echo $productImage; ?>"/></div>
-            <div class="item-info">
-                <div class="item-title" style="font: bold <?php echo $title2size; ?>px <?php echo $title2name; ?>; color: <?php echo $title2color; ?>;"><?php echo $this->__('Product Name3 1'); ?></div>
-                <div class="item-price-block">
-                    <span class="item-price" style="font: bold <?php echo $title5size; ?>px <?php echo $title5name; ?>; color: <?php echo $title5color; ?>;">$39.99</span>
-                </div>
-                <div class="item-rate">
-                    <span class="stars" style="color:<?php echo $secondaryColor; ?>;">
-                        <span class="star">f</span><span class="star">f</span><span class="star">f</span><span class="star">f</span><span class="star">c</span>
-                    </span>
-                    <strong style="color:<?php echo $text2color; ?>;">(2)</strong>
-                </div>
-                <div class="availability">
-                    <span class="item-status" style="font: bold <?php echo  $text2size; ?>px <?php echo $text2name; ?>; color: <?php echo $text2color; ?>;">In Stock</span>
-                </div>
-            </div>
-            <div class="arrow">&nbsp;</div>
-        </div>
-        <div class="item" style="background:<?php echo $primaryColor; ?>;">
-            <div class="gradient"></div>
-            <div class="item-image"><img width="72" height="72" src="<?php echo $productImage; ?>"/></div>
-            <div class="item-info">
-                <div class="item-title" style="font: bold <?php echo $title2size; ?>px <?php echo $title2name; ?>; color: <?php echo $title2color; ?>;"><?php echo $this->__('Product Name3 2'); ?></div>
-                <div class="item-price-block">
-                    <span class="item-price" style="font: bold <?php echo $title5size; ?>px <?php echo $title5name; ?>; color: <?php echo $title5color; ?>;">$39.99</span>
-                </div>
-                <div class="item-rate">
-                    <span class="stars" style="color:<?php echo $secondaryColor; ?>;">
-                        <span class="star">f</span><span class="star">f</span><span class="star">f</span><span class="star">f</span><span class="star">c</span>
-                    </span>
-                    <strong style="color:<?php echo $text2color; ?>;">(2)</strong>
-                </div>
-                <div class="availability">
-                    <span class="item-status" style="font: bold <?php echo  $text2size; ?>px <?php echo $text2name; ?>; color: <?php echo $text2color; ?>;"><?php echo $this->__('In Stock'); ?></span>
-                </div>
-            </div>
-            <div class="arrow">&nbsp;</div>
-        </div>
-        <div class="slider-item" style="border-top:1px solid #666; border-bottom:1px solid #777; display: table; width: 320px; height: 91px; background:<?php echo $this->getData('conf/body/secondaryColor'); ?>;">
-            <div class="slider-item">
-                <img src="<?php echo $this->getPreviewImagesUrl('slider/viewGallery.png'); ?>" class="slider-image"/>
-                <div class="slider-item-text" style="font: bold <?php echo $title8size; ?>px <?php echo $title8name; ?>; color: <?php echo $title8color; ?>;" class="slider-item-text" >
-                    <?php echo $this->__('View Gallery'); ?>
-                </div>
-            </div>
-            <div class="slider-item">
-                <img src="<?php echo $this->getPreviewImagesUrl('slider/tellAFriend.png'); ?>" class="slider-image"/>
-                <div class="slider-item-text" style="font: bold <?php echo $title8size; ?>px <?php echo $title8name; ?>; color: <?php echo $title8color; ?>;" class="slider-item-text" >
-                    <?php echo $this->__('Tell a Friend'); ?>
-                </div>
-            </div>
-            <div class="slider-item">
-                <img src="<?php echo $this->getPreviewImagesUrl('slider/addToWishlist.png'); ?>" class="slider-image"/>
-                <div class="slider-item-text" style="font: bold <?php echo $title8size; ?>px <?php echo $title8name; ?>; color: <?php echo $title8color; ?>;" class="slider-item-text" >
-                    <?php echo $this->__('Add to Wishlist'); ?>
-                </div>
-            </div>
-            <div class="slider-item">
-                <img src="<?php echo $this->getPreviewImagesUrl('slider/addToCart.png'); ?>" class="slider-image"/>
-                <div class="slider-item-text" style="font: bold <?php echo $title8size; ?>px <?php echo $title8name; ?>; color: <?php echo $title8color; ?>;" class="slider-item-text" >
-                    <?php echo $this->__('Add to Cart'); ?>
-                </div>
-            </div>
-            <div class="slider-item">
-                <img src="<?php echo $this->getPreviewImagesUrl('slider/viewDetails.png'); ?>" class="slider-image"/>
-                <div class="slider-item-text" style="font: bold <?php echo $title8size; ?>px <?php echo $title8name; ?>; color: <?php echo $title8color; ?>;" class="slider-item-text" >
-                    <?php echo $this->__('View Details'); ?>
-                </div>
-            </div>
-        </div>
-        <div style="clear:both"></div>
-        <div class="item" style="background: <?php echo $primaryColor; ?>">
-            <div class="gradient"></div>
-            <div class="item-image"><img width="72" height="72" src="<?php echo $productImage; ?>"  /></div>
-            <div class="item-info">
-                <div class="item-title" style="font: bold <?php echo $title2size; ?>px <?php echo $title2name; ?>; color: <?php echo $title2color; ?>;"><?php echo $this->__('Product Name3 '); ?></div>
-                <div class="item-price-block">
-                    <span class="item-price" style="font: bold <?php echo $title5size; ?>px <?php echo $title5name; ?>; color: <?php echo $title5color; ?>;">$39.99</span>
-                </div>
-                <div class="item-rate">
-                    <span class="stars" style="color:<?php echo $secondaryColor; ?>;">
-                        <span class="star">f</span><span class="star">f</span><span class="star">f</span><span class="star">f</span><span class="star">c</span>
-                    </span>
-                    <strong style="color:<?php echo $text2color; ?>;">(4)</strong>
-                </div>
-                <div class="availability">
-                    <span class="item-status" style="font: bold <?php echo  $text2size; ?>px <?php echo $text2name; ?>; color: <?php echo $text2color; ?>;"><?php echo $this->__('In Stock'); ?></span>
-                </div>
-            </div>
-            <div class="arrow">&nbsp;</div>
-        </div>
-    </div>
-  <?php echo $this->getChildHtml('tab_items'); ?>
-</div>
-</div>
-<?php if ($this->getJsErrorMessage()) : ?>
-<script type="text/javascript">
-    alert('<?php echo $this->getJsErrorMessage(); ?>');
-</script>
-<?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_android.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_android.phtml
index 97dcafcaf7..7145a9f2a3 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_android.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_android.phtml
@@ -25,27 +25,28 @@
  */
 ?>
 <?php
-$title1color = $this->getConfigFontInfo('Title1/color');
-$title2color = $this->getConfigFontInfo('Title2/color');
-$title5color = $this->getConfigFontInfo('Title5/color');
+/** @var $previewModel Mage_XmlConnect_Model_Preview_Android */
+$previewModel = Mage::helper('xmlconnect')->getPreviewModel();
 
-$primaryColor = $this->getData('conf/body/primaryColor');
-$secondaryColor = $this->getData('conf/body/secondaryColor');
+$title1color = $previewModel->getConfigFontInfo('Title1/color');
+$title2color = $previewModel->getConfigFontInfo('Title2/color');
+$title5color = $previewModel->getConfigFontInfo('Title5/color');
 
-$starImage = $this->getPreviewImagesUrl('android/bg_star.png');
-$emptyStarImage = $this->getPreviewImagesUrl('android/bg_star_empty.png');
-?>
-<link rel="stylesheet" type="text/css" href="<?php echo $this->getPreviewCssUrl('mobile-android.css'); ?>" media="all" />
+$primaryColor = $previewModel->getData('conf/body/primaryColor');
+$secondaryColor = $previewModel->getData('conf/body/secondaryColor');
 
-<div class="main-frame main-frame-catalog" style="background-color:<?php echo $this->getData('conf/body/backgroundColor'); ?>;">
-    <div class="phone catalog-page">            
+$starImage = $previewModel->getPreviewImagesUrl('android/bg_star.png');
+$emptyStarImage = $previewModel->getPreviewImagesUrl('android/bg_star_empty.png');
+?>
+<div class="main-frame main-frame-catalog" style="background-color:<?php echo $previewModel->getData('conf/body/backgroundColor'); ?>;">
+    <div class="phone catalog-page">
         <div class="status-bar"></div>
-        <div class="header-wrap" style="background-color:<?php echo $this->getData('conf/navigationBar/tintColor'); ?>;">
-            <div class="header">
+        <div class="header-wrap" style="background-color:<?php echo $previewModel->getData('conf/navigationBar/tintColor'); ?>;">
+            <div class="app-header">
                 <div class="icon icon-home"></div>
                 <?php echo $this->getChildHtml('tab_items'); ?>
-                <div class="logo">
-                    <img src="<?php echo $this->getLogoUrl(); ?>" alt="logo" /><span style="color:<?php echo $title1color; ?>;"><?php echo $this->__("Chairs"); ?></span>
+                <div class="app-logo">
+                    <img src="<?php echo $previewModel->getLogoUrl(); ?>" alt="logo" /><span style="color:<?php echo $title1color; ?>;"><?php echo $this->__("Chairs"); ?></span>
                 </div>
             </div>
         </div>
@@ -66,7 +67,7 @@ $emptyStarImage = $this->getPreviewImagesUrl('android/bg_star_empty.png');
                     <div class="wrap">
                         <div class="col-1">
                             <div class="product-image">
-                                <img src="<?php echo $this->getPreviewImagesUrl('android/product_image_1.jpg') ?>" alt="Bertoia Wire Chair" />
+                                <img src="<?php echo $previewModel->getPreviewImagesUrl('android/product_image_1.jpg') ?>" alt="Bertoia Wire Chair" />
                             </div>
                             <div class="rating">
                                 <span class="stars" style="color:<?php echo $secondaryColor; ?>;">
@@ -88,7 +89,7 @@ $emptyStarImage = $this->getPreviewImagesUrl('android/bg_star_empty.png');
                     <div class="wrap">
                         <div class="col-1">
                             <div class="product-image">
-                                <img src="<?php echo $this->getPreviewImagesUrl('android/product_image_2.jpg') ?>" alt="Bertoia Wire Chair" />
+                                <img src="<?php echo $previewModel->getPreviewImagesUrl('android/product_image_2.jpg') ?>" alt="Bertoia Wire Chair" />
                             </div>
                             <div class="rating">
                                 <span class="stars" style="color:<?php echo $secondaryColor; ?>;">
@@ -111,7 +112,7 @@ $emptyStarImage = $this->getPreviewImagesUrl('android/bg_star_empty.png');
                     <div class="wrap">
                         <div class="col-1">
                             <div class="product-image">
-                                <img src="<?php echo $this->getPreviewImagesUrl('android/product_image_3.jpg') ?>" alt="Bertoia Wire Chair" />
+                                <img src="<?php echo $previewModel->getPreviewImagesUrl('android/product_image_3.jpg') ?>" alt="Bertoia Wire Chair" />
                             </div>
                             <div class="rating">
                                 <span class="stars" style="color:<?php echo $secondaryColor; ?>;">
@@ -133,7 +134,7 @@ $emptyStarImage = $this->getPreviewImagesUrl('android/bg_star_empty.png');
                     <div class="wrap">
                         <div class="col-1">
                             <div class="product-image">
-                                <img src="<?php echo $this->getPreviewImagesUrl('android/product_image_4.jpg') ?>" alt="Bertoia Wire Chair" />
+                                <img src="<?php echo $previewModel->getPreviewImagesUrl('android/product_image_4.jpg') ?>" alt="Bertoia Wire Chair" />
                             </div>
                             <div class="rating">
                                 <span class="stars" style="color:<?php echo $secondaryColor; ?>;">
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_hor_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_hor_ipad.phtml
index 18ceef502f..29b6c7aa63 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_hor_ipad.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_hor_ipad.phtml
@@ -25,22 +25,23 @@
  */
 ?>
 <?php
-$title1color = $this->getConfigFontInfo('Title1/color');
-$title2color = $this->getConfigFontInfo('Title2/color');
-$title5color = $this->getConfigFontInfo('Title5/color');
+/** @var $previewModel Mage_XmlConnect_Model_Preview_Ipad */
+$previewModel = Mage::helper('xmlconnect')->getPreviewModel();
 
-$primaryColor = $this->getData('conf/body/primaryColor');
-$secondaryColor = $this->getData('conf/body/secondaryColor');
+$title1color = $previewModel->getConfigFontInfo('Title1/color');
+$title2color = $previewModel->getConfigFontInfo('Title2/color');
+$title5color = $previewModel->getConfigFontInfo('Title5/color');
 
-$productImage = $this->getPreviewImagesUrl('ipad/bg_product_image.png');
-$backgroundIpadLandscapeImage = $this->getBackgroundImage(Mage_XmlConnect_Helper_Ipad::ORIENTATION_LANDSCAPE);
-?>
-<link rel="stylesheet" type="text/css" href="<?php echo $this->getPreviewCssUrl('mobile-ipad-catalog.css'); ?>" media="all" />
+$primaryColor = $previewModel->getData('conf/body/primaryColor');
+$secondaryColor = $previewModel->getData('conf/body/secondaryColor');
 
-<div class="ipad ipad-horizontal" style="background: <?php echo $this->getData('conf/body/backgroundColor'); ?>;">
+$productImage = $previewModel->getPreviewImagesUrl('ipad/bg_product_image.png');
+$backgroundIpadLandscapeImage = $previewModel->setOrientation(Mage_XmlConnect_Helper_Ipad::ORIENTATION_LANDSCAPE)->getBackgroundImage();
+?>
+<div class="ipad-catalog ipad-catalog-landscape" style="background: <?php echo $previewModel->getData('conf/body/backgroundColor'); ?>;">
     <div class="status-bar"></div>
-    <div class="header-wrap" style="background-color:<?php echo $this->getData('conf/navigationBar/tintColor'); ?>;">
-        <div class="header">
+    <div class="header-wrap" style="background-color:<?php echo $previewModel->getData('conf/navigationBar/tintColor'); ?>;">
+        <div class="app-header">
             <?php echo $this->getChildHtml('tab_items'); ?>
         </div>
     </div>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_ipad.phtml
index f429cf1d68..0baab91716 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_ipad.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_ipad.phtml
@@ -25,22 +25,23 @@
  */
 ?>
 <?php
-$title1color = $this->getConfigFontInfo('Title1/color');
-$title2color = $this->getConfigFontInfo('Title2/color');
-$title5color = $this->getConfigFontInfo('Title5/color');
+/** @var $previewModel Mage_XmlConnect_Model_Preview_Ipad */
+$previewModel = Mage::helper('xmlconnect')->getPreviewModel();
 
-$primaryColor = $this->getData('conf/body/primaryColor');
-$secondaryColor = $this->getData('conf/body/secondaryColor');
+$title1color = $previewModel->getConfigFontInfo('Title1/color');
+$title2color = $previewModel->getConfigFontInfo('Title2/color');
+$title5color = $previewModel->getConfigFontInfo('Title5/color');
 
-$productImage = $this->getPreviewImagesUrl('ipad/bg_product_image.png');
-$backgroundIpadPortraitImage = $this->getBackgroundImage(Mage_XmlConnect_Helper_Ipad::ORIENTATION_PORTRAIT);
-?>
-<link rel="stylesheet" type="text/css" href="<?php echo $this->getPreviewCssUrl('mobile-ipad-catalog.css'); ?>" media="all" />
+$primaryColor = $previewModel->getData('conf/body/primaryColor');
+$secondaryColor = $previewModel->getData('conf/body/secondaryColor');
 
-<div class="ipad" style="background: <?php echo $this->getData('conf/body/backgroundColor'); ?>;">
+$productImage = $previewModel->getPreviewImagesUrl('ipad/bg_product_image.png');
+$backgroundIpadPortraitImage = $previewModel->setOrientation(Mage_XmlConnect_Helper_Ipad::ORIENTATION_PORTRAIT)->getBackgroundImage();
+?>
+<div class="ipad-catalog" style="background: <?php echo $previewModel->getData('conf/body/backgroundColor'); ?>;">
     <div class="status-bar"></div>
-    <div class="header-wrap" style="background-color:<?php echo $this->getData('conf/navigationBar/tintColor'); ?>;">
-        <div class="header">
+    <div class="header-wrap" style="background-color:<?php echo $previewModel->getData('conf/navigationBar/tintColor'); ?>;">
+        <div class="app-header">
             <?php echo $this->getChildHtml('tab_items'); ?>
         </div>
     </div>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_iphone.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_iphone.phtml
new file mode 100755
index 0000000000..abd0b4386e
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/catalog_iphone.phtml
@@ -0,0 +1,232 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/** @var $previewModel Mage_XmlConnect_Model_Preview_Iphone */
+$previewModel = Mage::helper('xmlconnect')->getPreviewModel();
+
+$title1size = $previewModel->getConfigFontInfo('Title1/size');
+$title1name = $previewModel->getConfigFontInfo('Title1/name');
+$title1color = $previewModel->getConfigFontInfo('Title1/color');
+
+$title2name = $previewModel->getConfigFontInfo('Title2/name');
+$title2size = $previewModel->getConfigFontInfo('Title2/size');
+$title2color = $previewModel->getConfigFontInfo('Title2/color');
+
+$title3size = $previewModel->getConfigFontInfo('Title3/size');
+$title3name = $previewModel->getConfigFontInfo('Title3/name');
+$title3color = $previewModel->getConfigFontInfo('Title3/color');
+
+$title5name = $previewModel->getConfigFontInfo('Title5/name');
+$title5size = $previewModel->getConfigFontInfo('Title5/size');
+$title5color = $previewModel->getConfigFontInfo('Title5/color');
+
+$title8name = $previewModel->getConfigFontInfo('Title8/name');
+$title8size = $previewModel->getConfigFontInfo('Title8/size');
+$title8color = $previewModel->getConfigFontInfo('Title8/color');
+
+$text2name = $previewModel->getConfigFontInfo('Text2/name');
+$text2size = $previewModel->getConfigFontInfo('Text2/size');
+$text2color = $previewModel->getConfigFontInfo('Text2/color');
+
+$naviBarTintColor = $previewModel->getData('conf/navigationBar/tintColor');
+$primaryColor = $previewModel->getData('conf/body/primaryColor');
+$secondaryColor = $previewModel->getData('conf/body/secondaryColor');
+
+$activeStartImage = $previewModel->getPreviewImagesUrl('star-active.png');
+$inactiveStartImage = $previewModel->getPreviewImagesUrl('star-inactive.png');
+$productImage = $previewModel->getPreviewImagesUrl('t-shirt.png');
+?>
+<div class="iphone-catalog">
+    <div class="main-frame">
+        <div class="main-block" style="background: #000;">
+            <div class="top-header" style="background: #000;">
+                <div class="volume" style="background:url('<?php echo $previewModel->getPreviewImagesUrl('1.gif'); ?>') bottom left no-repeat;"></div>
+                <div class="header-sign-1"><?php echo $this->__("Carrier"); ?></div>
+                <div class="antenna" style="background:url('<?php echo $previewModel->getPreviewImagesUrl('3.gif'); ?>') bottom right no-repeat;"></div>
+                <div class="time"><?php if($previewModel->getData('conf/Time')): ?><?php echo $previewModel->getData('conf/Time'); ?><?php else: ?><?php echo $this->__("10:40 AM"); ?><?php endif; ?></div>
+                <div class="battery" style="background:url('<?php echo $previewModel->getPreviewImagesUrl('2.gif'); ?>') bottom right no-repeat;"></div>
+            </div>
+            <div class="main-header"  style="background:<?php echo $naviBarTintColor; ?>;color:#f3f3f3;">
+                <div class="gradient">
+                    <table class="header-buttons">
+                        <tr>
+                            <td class="info">
+                                <div class="login-btn back-button">
+                                    <div class="login-left-alt"></div>
+                                    <div class="login-body"><span><?php echo $this->__('Back'); ?></span></div>
+                                    <div class="login-right"></div>
+                                </div>
+                            </td>
+                            <td class="logo-small"><div>
+                                <img src="<?php echo $previewModel->getLogoUrl(); ?>"/>
+                                <span class="sh-title">
+                                    <span class="sh-title1" style="font:bold <?php echo $title1size; ?>px <?php echo $title1name; ?>;">
+                                        <span class="sh-title2" style="color: <?php echo $title1color; ?>;"><?php echo $this->__("T-Shirts"); ?></span>
+                                <?php echo $this->__("T-Shirts"); ?>
+                            </span>
+                        </span>
+                            </div></td>
+                            <td class="info"><div class="login-btn edit-filter">
+
+        <!--                    <td class="login-btn edit-filter">-->
+                    <div class="login-left"></div>
+                    <div class="login-body"><span><?php echo $this->__('Edit Filter'); ?></span></div>
+                    <div class="login-right"></div>
+                            </div></td>
+                            <td class="info"><div class="login-btn edit-filter">
+                                <div class="login-left"></div>
+                                <div class="login-body"><span><?php echo $this->__('Edit Filter'); ?></span></div>
+                                <div class="login-right"></div>
+                            </div></td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <div class="filter-header" style="background:<?php echo $naviBarTintColor; ?>;">
+                <div class="gradient"></div>
+                <div style="background: url('<?php echo $previewModel->getData('conf/appliedFilters/backgroundImage'); ?>') center center no-repeat; width: 320px;height: 100%;">
+                    <div class="filter-lines">&nbsp;</div>
+                    <div class="filter-applied">
+                        <span class="filter-circle">3</span>
+                        <span class="filter-text"><?php echo $this->__('FILTERS APPLIED'); ?></span>
+                    </div>
+                </div>
+            </div>
+            <div class="sort-block" style="background:<?php echo $primaryColor; ?>;">
+                <div class="sort-block-inner">
+                    <div class="sort-block-inner-txt" style="font:bold <?php echo $title3size; ?>px <?php echo $title3name; ?>; color: <?php echo $title3color; ?>;"><?php echo $this->__('SORT BY:'); ?></div>
+                    <div class="buttons-holder">
+                        <span class="button button-pos" style="background-color:<?php echo $secondaryColor; ?>">Position<img src="<?php echo $previewModel->getPreviewImagesUrl('sort_buttons/button_up.gif');?>" alt="" /></span>
+                        <span class="button button-name">Name</span>
+                        <span class="button button-price">Price</span>
+                    </div>
+                </div>
+            </div>
+            <div class="items-list" style="background: <?php echo $previewModel->getData('conf/body/backgroundColor'); ?>">
+                <div class="item" style="background:<?php echo $primaryColor; ?>;">
+                    <div class="gradient"></div>
+                    <div class="item-image"><img width="72" height="72" src="<?php echo $productImage; ?>"/></div>
+                    <div class="item-info">
+                        <div class="item-title" style="font: bold <?php echo $title2size; ?>px <?php echo $title2name; ?>; color: <?php echo $title2color; ?>;"><?php echo $this->__('Product Name3 1'); ?></div>
+                        <div class="item-price-block">
+                            <span class="item-price" style="font: bold <?php echo $title5size; ?>px <?php echo $title5name; ?>; color: <?php echo $title5color; ?>;">$39.99</span>
+                        </div>
+                        <div class="item-rate">
+                            <span class="stars" style="color:<?php echo $secondaryColor; ?>;">
+                                <span class="star">f</span><span class="star">f</span><span class="star">f</span><span class="star">f</span><span class="star">c</span>
+                            </span>
+                            <strong style="color:<?php echo $text2color; ?>;">(2)</strong>
+                        </div>
+                        <div class="availability">
+                            <span class="item-status" style="font: bold <?php echo  $text2size; ?>px <?php echo $text2name; ?>; color: <?php echo $text2color; ?>;">In Stock</span>
+                        </div>
+                    </div>
+                    <div class="arrow">&nbsp;</div>
+                </div>
+                <div class="item" style="background:<?php echo $primaryColor; ?>;">
+                    <div class="gradient"></div>
+                    <div class="item-image"><img width="72" height="72" src="<?php echo $productImage; ?>"/></div>
+                    <div class="item-info">
+                        <div class="item-title" style="font: bold <?php echo $title2size; ?>px <?php echo $title2name; ?>; color: <?php echo $title2color; ?>;"><?php echo $this->__('Product Name3 2'); ?></div>
+                        <div class="item-price-block">
+                            <span class="item-price" style="font: bold <?php echo $title5size; ?>px <?php echo $title5name; ?>; color: <?php echo $title5color; ?>;">$39.99</span>
+                        </div>
+                        <div class="item-rate">
+                            <span class="stars" style="color:<?php echo $secondaryColor; ?>;">
+                                <span class="star">f</span><span class="star">f</span><span class="star">f</span><span class="star">f</span><span class="star">c</span>
+                            </span>
+                            <strong style="color:<?php echo $text2color; ?>;">(2)</strong>
+                        </div>
+                        <div class="availability">
+                            <span class="item-status" style="font: bold <?php echo  $text2size; ?>px <?php echo $text2name; ?>; color: <?php echo $text2color; ?>;"><?php echo $this->__('In Stock'); ?></span>
+                        </div>
+                    </div>
+                    <div class="arrow">&nbsp;</div>
+                </div>
+                <div class="slider" style="border-top:1px solid #666; border-bottom:1px solid #777; display: table; width: 320px; height: 91px; background-color:<?php echo $previewModel->getData('conf/body/secondaryColor'); ?>;">
+                    <div class="slider-item">
+                        <img src="<?php echo $previewModel->getPreviewImagesUrl('slider/viewGallery.png'); ?>" class="slider-image"/>
+                        <div class="slider-item-text" style="font: bold <?php echo $title8size; ?>px <?php echo $title8name; ?>; color: <?php echo $title8color; ?>;" class="slider-item-text" >
+                            <?php echo $this->__('View Gallery'); ?>
+                        </div>
+                    </div>
+                    <div class="slider-item">
+                        <img src="<?php echo $previewModel->getPreviewImagesUrl('slider/tellAFriend.png'); ?>" class="slider-image"/>
+                        <div class="slider-item-text" style="font: bold <?php echo $title8size; ?>px <?php echo $title8name; ?>; color: <?php echo $title8color; ?>;" class="slider-item-text" >
+                            <?php echo $this->__('Tell a Friend'); ?>
+                        </div>
+                    </div>
+                    <div class="slider-item">
+                        <img src="<?php echo $previewModel->getPreviewImagesUrl('slider/addToWishlist.png'); ?>" class="slider-image"/>
+                        <div class="slider-item-text" style="font: bold <?php echo $title8size; ?>px <?php echo $title8name; ?>; color: <?php echo $title8color; ?>;" class="slider-item-text" >
+                            <?php echo $this->__('Add to Wishlist'); ?>
+                        </div>
+                    </div>
+                    <div class="slider-item">
+                        <img src="<?php echo $previewModel->getPreviewImagesUrl('slider/addToCart.png'); ?>" class="slider-image"/>
+                        <div class="slider-item-text" style="font: bold <?php echo $title8size; ?>px <?php echo $title8name; ?>; color: <?php echo $title8color; ?>;" class="slider-item-text" >
+                            <?php echo $this->__('Add to Cart'); ?>
+                        </div>
+                    </div>
+                    <div class="slider-item">
+                        <img src="<?php echo $previewModel->getPreviewImagesUrl('slider/viewDetails.png'); ?>" class="slider-image"/>
+                        <div class="slider-item-text" style="font: bold <?php echo $title8size; ?>px <?php echo $title8name; ?>; color: <?php echo $title8color; ?>;" class="slider-item-text" >
+                            <?php echo $this->__('View Details'); ?>
+                        </div>
+                    </div>
+                </div>
+                <div style="clear:both"></div>
+                <div class="item" style="background: <?php echo $primaryColor; ?>">
+                    <div class="gradient"></div>
+                    <div class="item-image"><img width="72" height="72" src="<?php echo $productImage; ?>"  /></div>
+                    <div class="item-info">
+                        <div class="item-title" style="font: bold <?php echo $title2size; ?>px <?php echo $title2name; ?>; color: <?php echo $title2color; ?>;"><?php echo $this->__('Product Name3 '); ?></div>
+                        <div class="item-price-block">
+                            <span class="item-price" style="font: bold <?php echo $title5size; ?>px <?php echo $title5name; ?>; color: <?php echo $title5color; ?>;">$39.99</span>
+                        </div>
+                        <div class="item-rate">
+                            <span class="stars" style="color:<?php echo $secondaryColor; ?>;">
+                                <span class="star">f</span><span class="star">f</span><span class="star">f</span><span class="star">f</span><span class="star">c</span>
+                            </span>
+                            <strong style="color:<?php echo $text2color; ?>;">(4)</strong>
+                        </div>
+                        <div class="availability">
+                            <span class="item-status" style="font: bold <?php echo  $text2size; ?>px <?php echo $text2name; ?>; color: <?php echo $text2color; ?>;"><?php echo $this->__('In Stock'); ?></span>
+                        </div>
+                    </div>
+                    <div class="arrow">&nbsp;</div>
+                </div>
+            </div>
+          <?php echo $this->getChildHtml('tab_items'); ?>
+        </div>
+    </div>
+</div>
+<?php if ($this->getJsErrorMessage()) : ?>
+<script type="text/javascript">
+    alert('<?php echo $this->getJsErrorMessage(); ?>');
+</script>
+<?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home.phtml
deleted file mode 100644
index 930155d73f..0000000000
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home.phtml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     default_default
- * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-$categoryItemTintColor = $this->getCategoryItemTintColor();
-$categoryItemBackgroundColor = $this->getData('conf/categoryItem/backgroundColor');
-
-$title1name = $this->getConfigFontInfo('Title1/name');
-$title1size = $this->getConfigFontInfo('Title1/size');
-$title1color = $this->getConfigFontInfo('Title1/color');
-
-$title9name = $this->getConfigFontInfo('Title9/name');
-$title9size = $this->getConfigFontInfo('Title9/size');
-$title9color = $this->getConfigFontInfo('Title9/color');
-
-$backgroundColor = $this->getData('conf/body/backgroundColor');
-$menImage = $this->getPreviewImagesUrl('men.png');
-$bannerImage = $this->getBannerImage();
-?>
-<link rel="stylesheet" type="text/css" href="<?php echo $this->getPreviewCssUrl('mobile-home.css'); ?>" media="all" />
-<div class="main-frame">
-<div class="main-block" style="background: <?php echo $backgroundColor; ?>;">
-    <div class="top-header" style="background:#000;">
-        <div class="volume" style="background:url('<?php echo $this->getPreviewImagesUrl('1.gif'); ?>') bottom left no-repeat;"></div>
-        <div class="header-sign-1"><?php echo $this->__("Carrier"); ?></div>
-        <div class="antenna" style="background:url('<?php echo $this->getPreviewImagesUrl('3.gif'); ?>') bottom right no-repeat;"></div>
-        <div class="time"><?php if($this->getData('conf/Time')): ?><?php echo $this->getData('conf/Time'); ?><?php else: ?><?php echo $this->__("10:40 AM"); ?><?php endif; ?></div>
-        <div class="battery" style="background:url('<?php echo $this->getPreviewImagesUrl('2.gif'); ?>') bottom right no-repeat;"></div>
-    </div>
-    <div class="main-header"  style="background:<?php echo $this->getData('conf/navigationBar/tintColor'); ?>;color:#f3f3f3;">
-        <div class="gradient">
-            <table class="header-buttons">
-                <tr>
-                    <td class="info"><img src="<?php echo $this->getPreviewImagesUrl('info.png') ?>" width="20" height="20" /></td>
-		            <td class="logo-small"><div>
-                    	<img src="<?php echo $this->getLogoUrl(); ?>"/>
-			<span class="sh-title">
-			    <span class="sh-title1" style="font:bold <?php echo $title1size; ?>px/44px <?php echo $title1name; ?>;">
-				<span class="sh-title2" style="color: <?php echo $title1color; ?>;"><?php echo $this->__("Home"); ?></span>
-				<?php echo $this->__("Home"); ?>
-			    </span>
-			</span>
-		            </div></td>
-                    <td class="login-btn">
-                        <div class="login-left"></div>
-                        <div class="login-body"><span><?php echo $this->__("Log In"); ?></span></div>
-                        <div class="login-right"></div>
-                    </td>
-                </tr>
-            </table>
-        </div>
-    </div>
-    <div class="big-logo" style="background:<?php echo $backgroundColor; ?>;">
-        <img src="<?php echo $bannerImage; ?>" />
-    </div>
-    <div class="catalog" style="background:<?php echo $this->getData('conf/body/scrollBackgroundColor'); ?>">
-        <div class="item" style="background:<?php echo $categoryItemBackgroundColor; ?>">
-            <img src="<?php echo $menImage ?>" width="80" height="80" alt="" />
-            <div class="item-text" style="font:bold <?php echo $title9size; ?>px <?php echo $title9name; ?>;color:<?php echo $title9color; ?>;<?php echo $categoryItemTintColor; ?>"><?php echo $this->__("80x80 px"); ?></div>
-        </div>
-        <div class="item" style="background:<?php echo $categoryItemBackgroundColor; ?>">
-            <img src="<?php echo $menImage ?>" width="80" height="80" alt="" />
-            <div class="item-text" style="font:bold <?php echo $title9size; ?>px <?php echo $title9name; ?>;color:<?php echo $title9color; ?>;<?php echo $categoryItemTintColor; ?>"><?php echo $this->__("80x80 px"); ?></div>
-        </div>
-        <div class="item" style="background:<?php echo $categoryItemBackgroundColor; ?>">
-            <img src="<?php echo $menImage ?>" width="80" height="80" alt="" />
-            <div class="item-text" style="font:bold <?php echo $title9size; ?>px <?php echo $title9name; ?>;color:<?php echo $title9color; ?>;<?php echo $categoryItemTintColor; ?>"><?php echo $this->__("80x80 px"); ?></div>
-        </div>
-        <div class="item" style="background:<?php echo $categoryItemBackgroundColor; ?>">
-            <img src="<?php echo $menImage ?>" width="80" height="80" alt="" />
-            <div class="item-text" style="font:bold <?php echo $title9size; ?>px <?php echo $title9name; ?>;color:<?php echo $title9color; ?>;<?php echo $categoryItemTintColor; ?>"><?php echo $this->__("80x80 px"); ?></div>
-        </div>
-        <!-- div class="item" style="background:<?php echo $categoryItemBackgroundColor; ?>">
-            <img src="<?php echo $menImage ?>" width="80" height="80" alt="" />
-            <div class="item-text" style="font:bold <?php echo $title9size; ?>px/18px <?php echo $title9name; ?>;color:<?php echo $title9color; ?>; background:<?php echo $this->getData('conf/categoryItem/tintColor'); ?>"><?php echo $this->__("80x80 px"); ?></div>
-        </div -->
-    </div>
-    <?php echo $this->getChildHtml('tab_items'); ?>
-</div>
-</div>
-<?php if ($this->getJsErrorMessage()) : ?>
-<script type="text/javascript">
-    alert('<?php echo $this->getJsErrorMessage(); ?>');
-</script>
-<?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_android.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_android.phtml
index 6797bf4b51..63010aa118 100755
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_android.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_android.phtml
@@ -25,48 +25,49 @@
  */
 ?>
 <?php
-$title1color = $this->getConfigFontInfo('Title1/color');
-$categoryItemTintColor = $this->getCategoryItemTintColor();
-$categoryItemBackgroundColor = $this->getData('conf/categoryItem/backgroundColor');
-$categoryItemTintColor = $this->getData('conf/categoryItem/tintColor');
-$title1color = $this->getConfigFontInfo('Title1/color');
-$title9size = $this->getConfigFontInfo('Title9/size');
-$productImage = $this->getPreviewImagesUrl('android/product_image.png');
-$bannerImageAndroid = $this->getBannerImage();
-?>
-<link rel="stylesheet" type="text/css" href="<?php echo $this->getPreviewCssUrl('mobile-android.css'); ?>" media="all" />
+/** @var $previewModel Mage_XmlConnect_Model_Preview_Android */
+$previewModel = Mage::helper('xmlconnect')->getPreviewModel();
 
-<div class="main-frame main-frame-home" style="background-color:<?php echo $this->getData('conf/body/backgroundColor'); ?>;">
+$title1color = $previewModel->getConfigFontInfo('Title1/color');
+$categoryItemTintColor = $previewModel->getCategoryItemTintColor();
+$categoryItemBackgroundColor = $previewModel->getData('conf/categoryItem/backgroundColor');
+$categoryItemTintColor = $previewModel->getData('conf/categoryItem/tintColor');
+$title1color = $previewModel->getConfigFontInfo('Title1/color');
+$title9size = $previewModel->getConfigFontInfo('Title9/size');
+$productImage = $previewModel->getPreviewImagesUrl('android/product_image.png');
+$bannerImageAndroid = $previewModel->getBannerImage();
+?>
+<div class="main-frame main-frame-home" style="background-color:<?php echo $previewModel->getData('conf/body/backgroundColor'); ?>;">
     <div class="phone home-page" style="">
         <div class="status-bar"></div>
-        <div class="header-wrap" style="background-color:<?php echo $this->getData('conf/navigationBar/tintColor'); ?>">
-            <div class="header">
-                <div class="icon icon-home"></div>
+        <div class="header-wrap" style="background-color:<?php echo $previewModel->getData('conf/navigationBar/tintColor'); ?>">
+            <div class="app-header" style="color:<?php echo $title1color; ?>;">
+                <div class="icon icon-home">A</div>
                 <?php echo $this->getChildHtml('tab_items'); ?>
-                <div class="logo">
-                    <img src="<?php echo $this->getLogoUrl(); ?>" alt="logo" /><span style="color:<?php echo $title1color; ?>;"><?php echo $this->__("Home"); ?></span>
+                <div class="app-logo">
+                    <img src="<?php echo $previewModel->getLogoUrl(); ?>" alt="logo" /><span style="color:<?php echo $title1color; ?>;"><?php echo $this->__("Home"); ?></span>
                 </div>
             </div>
         </div>
         <div class="content" style="background-image:url(<?php echo $bannerImageAndroid; ?>)"></div>
-        <div class="items-list-wrap" style="background-color:<?php echo $this->getData('conf/body/scrollBackgroundColor'); ?>">
+        <div class="items-list-wrap" style="background-color:<?php echo $previewModel->getData('conf/body/scrollBackgroundColor'); ?>">
             <div class="items-list">
                 <ul>
                     <li style="background-color:<?php echo $categoryItemBackgroundColor; ?>">
                         <div class="product-image"><img src="<?php echo $productImage; ?>" alt="Chair" /></div>
-                        <span class="link" style="border-color:<?php echo $categoryItemTintColor; ?>"><a href="#" style="font-size:<?php echo $title9size; ?>px; color:<?php echo $this->getData('conf/fonts/Title9/color'); ?>; background-color:<?php echo $categoryItemTintColor; ?>">Chairs</a></span>
+                        <span class="link" style="border-color:<?php echo $categoryItemTintColor; ?>"><a href="#" style="font-size:<?php echo $title9size; ?>px; color:<?php echo $previewModel->getData('conf/fonts/Title9/color'); ?>; background-color:<?php echo $categoryItemTintColor; ?>; text-shadow:0 -1px 1px <?php echo $categoryItemTintColor; ?>;">Chairs</a></span>
                     </li>
                     <li style="background-color:<?php echo $categoryItemBackgroundColor; ?>">
                         <div class="product-image"><img src="<?php echo $productImage; ?>" alt="Table" /></div>
-                        <span class="link" style="border-color:<?php echo $categoryItemTintColor; ?>"><a href="#" style="font-size:<?php echo $title9size; ?>px; color:<?php echo $this->getData('conf/fonts/Title9/color'); ?>; background-color:<?php echo $categoryItemTintColor; ?>">Tables</a></span>
+                        <span class="link" style="border-color:<?php echo $categoryItemTintColor; ?>"><a href="#" style="font-size:<?php echo $title9size; ?>px; color:<?php echo $previewModel->getData('conf/fonts/Title9/color'); ?>; background-color:<?php echo $categoryItemTintColor; ?>; text-shadow:0 -1px 1px <?php echo $categoryItemTintColor; ?>;">Tables</a></span>
                     </li>
                     <li style="background-color:<?php echo $categoryItemBackgroundColor; ?>">
                         <div class="product-image"><img src="<?php echo $productImage; ?>" alt="Sofa" /></div>
-                        <span class="link" style="border-color:<?php echo $categoryItemTintColor; ?>"><a href="#" style="font-size:<?php echo $title9size; ?>px; color:<?php echo $this->getData('conf/fonts/Title9/color'); ?>; background-color:<?php echo $categoryItemTintColor; ?>">Sofas</a></span>
+                        <span class="link" style="border-color:<?php echo $categoryItemTintColor; ?>"><a href="#" style="font-size:<?php echo $title9size; ?>px; color:<?php echo $previewModel->getData('conf/fonts/Title9/color'); ?>; background-color:<?php echo $categoryItemTintColor; ?>; text-shadow:0 -1px 1px <?php echo $categoryItemTintColor; ?>;">Sofas</a></span>
                     </li>
                     <li style="background-color:<?php echo $categoryItemBackgroundColor; ?>">
                         <div class="product-image"><img src="<?php echo $productImage; ?>" alt="Shelve" /></div>
-                        <span class="link" style="border-color:<?php echo $categoryItemTintColor; ?>"><a href="#" style="font-size:<?php echo $title9size; ?>px; color:<?php echo $this->getData('conf/fonts/Title9/color'); ?>; background-color:<?php echo $categoryItemTintColor; ?>">Shelve</a></span>
+                        <span class="link" style="border-color:<?php echo $categoryItemTintColor; ?>"><a href="#" style="font-size:<?php echo $title9size; ?>px; color:<?php echo $previewModel->getData('conf/fonts/Title9/color'); ?>; background-color:<?php echo $categoryItemTintColor; ?>; text-shadow:0 -1px 1px <?php echo $categoryItemTintColor; ?>;">Shelve</a></span>
                     </li>
                 </ul>
             </div>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_hor_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_hor_ipad.phtml
index 82f2905897..f525f22fa8 100755
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_hor_ipad.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_hor_ipad.phtml
@@ -25,26 +25,27 @@
  */
 ?>
 <?php
-$title1color = $this->getConfigFontInfo('Title1/color');
-$categoryItemTintColor = $this->getCategoryItemTintColor();
-$categoryItemBackgroundColor = $this->getData('conf/categoryItem/backgroundColor');
+/** @var $previewModel Mage_XmlConnect_Model_Preview_Ipad */
+$previewModel = Mage::helper('xmlconnect')->getPreviewModel();
 
-$productImage = $this->getPreviewImagesUrl('ipad/product_image.jpg');
-$backgroundIpadLandscapeImage = $this->getBackgroundImage(Mage_XmlConnect_Helper_Ipad::ORIENTATION_LANDSCAPE);
-$bannerImageIpad = $this->getBannerImage();
-?>
-<link rel="stylesheet" type="text/css" href="<?php echo $this->getPreviewCssUrl('mobile-ipad-home.css'); ?>" media="all" />
+$title1color = $previewModel->getConfigFontInfo('Title1/color');
+$categoryItemTintColor = $previewModel->getCategoryItemTintColor();
+$categoryItemBackgroundColor = $previewModel->getData('conf/categoryItem/backgroundColor');
 
-<div class="ipad ipad-horizontal" style="background: <?php echo $this->getData('conf/body/backgroundColor'); ?>;">
+$productImage = $previewModel->getPreviewImagesUrl('ipad/product_image.jpg');
+$backgroundIpadLandscapeImage = $previewModel->setOrientation(Mage_XmlConnect_Helper_Ipad::ORIENTATION_LANDSCAPE)->getBackgroundImage();
+$bannerImageIpad = $previewModel->getBannerImage();
+?>
+<div class="ipad ipad-landscape" style="background: <?php echo $previewModel->getData('conf/body/backgroundColor'); ?>;">
     <div class="status-bar"></div>
-    <div class="header-wrap" style="background-color:<?php echo $this->getData('conf/navigationBar/tintColor'); ?>;">
-        <div class="header">
+    <div class="header-wrap" style="background-color:<?php echo $previewModel->getData('conf/navigationBar/tintColor'); ?>;">
+        <div class="app-header">
             <?php echo $this->getChildHtml('tab_items'); ?>
         </div>
     </div>
     <div class="shadow"></div>
     <div class="content" style="background-image:url(<?php echo $backgroundIpadLandscapeImage; ?>)">
-        <div class="logo" style="background-image:url(<?php echo $bannerImageIpad; ?>)"></div>
+        <div class="app-logo" style="background-image:url(<?php echo $bannerImageIpad; ?>)"></div>
         <div class="products-list-wrap">
             <ul class="products-list">
                 <li style="background-color:<?php echo $categoryItemBackgroundColor; ?>">
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_ipad.phtml
index 76435ef12c..471749b0fc 100755
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_ipad.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_ipad.phtml
@@ -25,26 +25,27 @@
  */
 ?>
 <?php
-$title1color = $this->getConfigFontInfo('Title1/color');
-$categoryItemTintColor = $this->getCategoryItemTintColor();
-$categoryItemBackgroundColor = $this->getData('conf/categoryItem/backgroundColor');
+/** @var $previewModel Mage_XmlConnect_Model_Preview_Ipad */
+$previewModel = Mage::helper('xmlconnect')->getPreviewModel();
 
-$productImage = $this->getPreviewImagesUrl('ipad/product_image.jpg');
-$backgroundIpadPortraitImage = $this->getBackgroundImage(Mage_XmlConnect_Helper_Ipad::ORIENTATION_PORTRAIT);
-$bannerImageIpad = $this->getBannerImage();
-?>
-<link rel="stylesheet" type="text/css" href="<?php echo $this->getPreviewCssUrl('mobile-ipad-home.css'); ?>" media="all" />
+$title1color = $previewModel->getConfigFontInfo('Title1/color');
+$categoryItemTintColor = $previewModel->getCategoryItemTintColor();
+$categoryItemBackgroundColor = $previewModel->getData('conf/categoryItem/backgroundColor');
 
-<div class="ipad" style="background: <?php echo $this->getData('conf/body/backgroundColor'); ?>;">
+$productImage = $previewModel->getPreviewImagesUrl('ipad/product_image.jpg');
+$backgroundIpadPortraitImage = $previewModel->setOrientation(Mage_XmlConnect_Helper_Ipad::ORIENTATION_PORTRAIT)->getBackgroundImage();
+$bannerImageIpad = $previewModel->getBannerImage();
+?>
+<div class="ipad" style="background: <?php echo $previewModel->getData('conf/body/backgroundColor'); ?>;">
     <div class="status-bar"></div>
-    <div class="header-wrap" style="background-color:<?php echo $this->getData('conf/navigationBar/tintColor'); ?>;">
-        <div class="header">
+    <div class="header-wrap" style="background-color:<?php echo $previewModel->getData('conf/navigationBar/tintColor'); ?>;">
+        <div class="app-header">
             <?php echo $this->getChildHtml('tab_items'); ?>
         </div>
     </div>
     <div class="shadow"></div>
     <div class="content" style="background-image:url(<?php echo $backgroundIpadPortraitImage; ?>);">
-        <div class="logo" style="background-image:url(<?php echo $bannerImageIpad; ?>);"></div>
+        <div class="app-logo" style="background-image:url(<?php echo $bannerImageIpad; ?>);"></div>
         <div class="products-list-wrap">
             <ul class="products-list">
                 <li style="background-color:<?php echo $categoryItemBackgroundColor; ?>">
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_iphone.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_iphone.phtml
new file mode 100755
index 0000000000..7bc6167858
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/home_iphone.phtml
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/** @var $previewModel Mage_XmlConnect_Model_Preview_Iphone */
+$previewModel = Mage::helper('xmlconnect')->getPreviewModel();
+
+$categoryItemTintColor = $previewModel->getCategoryItemTintColor();
+$categoryItemBackgroundColor = $previewModel->getData('conf/categoryItem/backgroundColor');
+
+$title1name = $previewModel->getConfigFontInfo('Title1/name');
+$title1size = $previewModel->getConfigFontInfo('Title1/size');
+$title1color = $previewModel->getConfigFontInfo('Title1/color');
+
+$title9name = $previewModel->getConfigFontInfo('Title9/name');
+$title9size = $previewModel->getConfigFontInfo('Title9/size');
+$title9color = $previewModel->getConfigFontInfo('Title9/color');
+
+$backgroundColor = $previewModel->getData('conf/body/backgroundColor');
+$menImage = $previewModel->getPreviewImagesUrl('men.png');
+$bannerImage = $previewModel->getBannerImage();
+?>
+<div class="iphone-home">
+    <div class="main-frame">
+        <div class="main-block" style="background: <?php echo $backgroundColor; ?>;">
+            <div class="top-header" style="background:#000;">
+                <div class="volume" style="background:url('<?php echo $previewModel->getPreviewImagesUrl('1.gif'); ?>') bottom left no-repeat;"></div>
+                <div class="header-sign-1"><?php echo $this->__("Carrier"); ?></div>
+                <div class="antenna" style="background:url('<?php echo $previewModel->getPreviewImagesUrl('3.gif'); ?>') bottom right no-repeat;"></div>
+                <div class="time"><?php if($previewModel->getData('conf/Time')): ?><?php echo $previewModel->getData('conf/Time'); ?><?php else: ?><?php echo $this->__("10:40 AM"); ?><?php endif; ?></div>
+                <div class="battery" style="background:url('<?php echo $previewModel->getPreviewImagesUrl('2.gif'); ?>') bottom right no-repeat;"></div>
+            </div>
+            <div class="main-header"  style="background:<?php echo $previewModel->getData('conf/navigationBar/tintColor'); ?>;color:#f3f3f3;">
+                <div class="gradient">
+                    <table class="header-buttons">
+                        <tr>
+                            <td class="info"><img src="<?php echo $previewModel->getPreviewImagesUrl('info.png') ?>" alt="" width="20" height="20" /></td>
+                            <td class="logo-small"><div>
+                                <img src="<?php echo $previewModel->getLogoUrl();?>" alt=""/>
+                    <span class="sh-title">
+                        <span class="sh-title1" style="font:bold <?php echo $title1size; ?>px/44px <?php echo $title1name; ?>;">
+                        <span class="sh-title2" style="color: <?php echo $title1color; ?>;"><?php echo $this->__("Home"); ?></span>
+                        <?php echo $this->__("Home"); ?>
+                        </span>
+                    </span>
+                            </div></td>
+                            <td class="login-btn">
+                                <div class="login-left"></div>
+                                <div class="login-body"><span><?php echo $this->__("Log In"); ?></span></div>
+                                <div class="login-right"></div>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <div class="big-logo" style="background:<?php echo $backgroundColor; ?>;">
+                <img src="<?php echo $bannerImage; ?>" alt="" />
+            </div>
+            <div class="catalog" style="background:<?php echo $previewModel->getData('conf/body/scrollBackgroundColor'); ?>">
+                <div class="item" style="background:<?php echo $categoryItemBackgroundColor; ?>">
+                    <img src="<?php echo $menImage ?>" width="80" height="80" alt="" />
+                    <div class="item-text" style="font:bold <?php echo $title9size; ?>px <?php echo $title9name; ?>;color:<?php echo $title9color; ?>;<?php echo $categoryItemTintColor; ?>"><?php echo $this->__("80x80 px"); ?></div>
+                </div>
+                <div class="item" style="background:<?php echo $categoryItemBackgroundColor; ?>">
+                    <img src="<?php echo $menImage ?>" width="80" height="80" alt="" />
+                    <div class="item-text" style="font:bold <?php echo $title9size; ?>px <?php echo $title9name; ?>;color:<?php echo $title9color; ?>;<?php echo $categoryItemTintColor; ?>"><?php echo $this->__("80x80 px"); ?></div>
+                </div>
+                <div class="item" style="background:<?php echo $categoryItemBackgroundColor; ?>">
+                    <img src="<?php echo $menImage ?>" width="80" height="80" alt="" />
+                    <div class="item-text" style="font:bold <?php echo $title9size; ?>px <?php echo $title9name; ?>;color:<?php echo $title9color; ?>;<?php echo $categoryItemTintColor; ?>"><?php echo $this->__("80x80 px"); ?></div>
+                </div>
+                <div class="item" style="background:<?php echo $categoryItemBackgroundColor; ?>">
+                    <img src="<?php echo $menImage ?>" width="80" height="80" alt="" />
+                    <div class="item-text" style="font:bold <?php echo $title9size; ?>px <?php echo $title9name; ?>;color:<?php echo $title9color; ?>;<?php echo $categoryItemTintColor; ?>"><?php echo $this->__("80x80 px"); ?></div>
+                </div>
+                <!-- div class="item" style="background:<?php echo $categoryItemBackgroundColor; ?>">
+                    <img src="<?php echo $menImage ?>" width="80" height="80" alt="" />
+                    <div class="item-text" style="font:bold <?php echo $title9size; ?>px/18px <?php echo $title9name; ?>;color:<?php echo $title9color; ?>; background:<?php echo $previewModel->getData('conf/categoryItem/tintColor'); ?>"><?php echo $this->__("80x80 px"); ?></div>
+                </div -->
+            </div>
+            <?php echo $this->getChildHtml('tab_items'); ?>
+        </div>
+    </div>
+</div>
+<?php if ($this->getJsErrorMessage()) : ?>
+<script type="text/javascript">
+    alert('<?php echo $this->getJsErrorMessage(); ?>');
+</script>
+<?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/productinfo.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/productinfo_iphone.phtml
similarity index 51%
rename from app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/productinfo.phtml
rename to app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/productinfo_iphone.phtml
index 839069a0a3..0f7aea8dd3 100755
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/productinfo.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/productinfo_iphone.phtml
@@ -25,32 +25,35 @@
  */
 ?>
 <?php
-$categoryItemTintColor = $this->getCategoryItemTintColor();
+/** @var $previewModel Mage_XmlConnect_Model_Preview_Iphone */
+$previewModel = Mage::helper('xmlconnect')->getPreviewModel();
+
+$categoryItemTintColor = $previewModel->getCategoryItemTintColor();
 ?>
-<link rel="stylesheet" type="text/css" href="<?php echo $this->getPreviewCssUrl('mobile-home.css'); ?>" media="all" />
+<link rel="stylesheet" type="text/css" href="<?php echo $previewModel->getPreviewCssUrl('mobile-home.css'); ?>" media="all" />
 <div class="main-frame">
-<div class="main-block" style="background: <?php echo $this->getData('conf/body/backgroundColor'); ?>;">
+<div class="main-block" style="background: <?php echo $previewModel->getData('conf/body/backgroundColor'); ?>;">
     <div class="top-header" style="background:#000;">
-        <div class="volume" style="background:url('<?php echo $this->getPreviewImagesUrl('1.gif'); ?>') bottom left no-repeat;"></div>
+        <div class="volume" style="background:url('<?php echo $previewModel->getPreviewImagesUrl('1.gif'); ?>') bottom left no-repeat;"></div>
         <div class="header-sign-1"><?php echo $this->__("Carrier"); ?></div>
-        <div class="antenna" style="background:url('<?php echo $this->getPreviewImagesUrl('3.gif'); ?>') bottom right no-repeat;"></div>
-        <div class="time"><?php if($this->getData('conf/Time')): ?><?php echo $this->getData('conf/Time'); ?><?php else: ?><?php echo $this->__("10:40 AM"); ?><?php endif; ?></div>
-        <div class="battery" style="background:url('<?php echo $this->getPreviewImagesUrl('2.gif'); ?>') bottom right no-repeat;"></div>
+        <div class="antenna" style="background:url('<?php echo $previewModel->getPreviewImagesUrl('3.gif'); ?>') bottom right no-repeat;"></div>
+        <div class="time"><?php if($previewModel->getData('conf/Time')): ?><?php echo $previewModel->getData('conf/Time'); ?><?php else: ?><?php echo $this->__("10:40 AM"); ?><?php endif; ?></div>
+        <div class="battery" style="background:url('<?php echo $previewModel->getPreviewImagesUrl('2.gif'); ?>') bottom right no-repeat;"></div>
     </div>
-    <div class="main-header"  style="background:<?php echo $this->getData('conf/navigationBar/tintColor'); ?>;color:#f3f3f3;">
+    <div class="main-header"  style="background:<?php echo $previewModel->getData('conf/navigationBar/tintColor'); ?>;color:#f3f3f3;">
         <div class="gradient">
             <table class="header-buttons">
                 <tr>
-                    <td class="info"><img src="<?php echo $this->getPreviewImagesUrl('info.png') ?>" width="20" height="20" /></td>
-		            <td class="logo-small"><div>
-                    	<img src="<?php echo $this->getData('conf/navigationBar/icon') ? $this->getData('conf/navigationBar/icon') : $this->getDesignPreviewImageUrl($this->getInterfaceImagesPaths('conf/navigationBar/icon')); ?>"/>
-			<span class="sh-title">
-			    <span class="sh-title1" style="font:bold <?php echo $this->getData('conf/fonts/Title1/size'); ?>px/44px <?php echo $this->getData('conf/fonts/Title1/name'); ?>;">
-				<span class="sh-title2" style="color: <?php echo $this->getData('conf/fonts/Title1/color'); ?>;"><?php echo $this->__("Home"); ?></span>
-				<?php echo $this->__("Home"); ?>
-			    </span>
-			</span>
-		            </div></td>
+                    <td class="info"><img src="<?php echo $previewModel->getPreviewImagesUrl('info.png') ?>" alt="" width="20" height="20" /></td>
+                    <td class="logo-small"><div>
+                            <img src="<?php echo $previewModel->getData('conf/navigationBar/icon') ? $previewModel->getData('conf/navigationBar/icon') : $previewModel->getDesignPreviewImageUrl($previewModel->getInterfaceImagesPaths('conf/navigationBar/icon'));?>" alt="" />
+            <span class="sh-title">
+                <span class="sh-title1" style="font:bold <?php echo $previewModel->getData('conf/fonts/Title1/size'); ?>px/44px <?php echo $previewModel->getData('conf/fonts/Title1/name'); ?>;">
+                <span class="sh-title2" style="color: <?php echo $previewModel->getData('conf/fonts/Title1/color'); ?>;"><?php echo $this->__("Home"); ?></span>
+                <?php echo $this->__("Home"); ?>
+                </span>
+            </span>
+                    </div></td>
                     <td class="login-btn">
                         <div class="login-left"></div>
                         <div class="login-body"><span><?php echo $this->__("Log In"); ?></span></div>
@@ -60,17 +63,17 @@ $categoryItemTintColor = $this->getCategoryItemTintColor();
             </table>
         </div>
     </div>
-    <div class="big-logo" style="background:<?php echo $this->getData('conf/body/backgroundColor'); ?>;">
-        <img src="<?php echo $this->getData('conf/body/bannerImage') ? $this->getData('conf/body/bannerImage') : $this->getDesignPreviewImageUrl($this->getInterfaceImagesPaths('conf/body/bannerImage')); ?>" />
+    <div class="big-logo" style="background:<?php echo $previewModel->getData('conf/body/backgroundColor'); ?>;">
+        <img src="<?php echo $previewModel->getData('conf/body/bannerImage') ? $previewModel->getData('conf/body/bannerImage') : $previewModel->getDesignPreviewImageUrl($previewModel->getInterfaceImagesPaths('conf/body/bannerImage')); ?>" />
     </div>
-    <div class="catalog" style="background:<?php echo $this->getData('conf/body/scrollBackgroundColor'); ?>">
-        <div class="item" style="background:<?php echo $this->getData('conf/categoryItem/backgroundColor'); ?>">
-            <img src="<?php echo $this->getPreviewImagesUrl('men.png') ?>" width="80" height="80" alt="" />
-            <div class="item-text" style="font:bold <?php echo $this->getData('conf/fonts/Title9/size'); ?>px <?php echo $this->getData('conf/fonts/Title9/name'); ?>;color:<?php echo $this->getData('conf/fonts/Title9/color'); ?>;<?php echo $categoryItemTintColor; ?>"><?php echo $this->__("80x80 px"); ?></div>
+    <div class="catalog" style="background:<?php echo $previewModel->getData('conf/body/scrollBackgroundColor'); ?>">
+        <div class="item" style="background:<?php echo $previewModel->getData('conf/categoryItem/backgroundColor'); ?>">
+            <img src="<?php echo $previewModel->getPreviewImagesUrl('men.png') ?>" width="80" height="80" alt="" />
+            <div class="item-text" style="font:bold <?php echo $previewModel->getData('conf/fonts/Title9/size'); ?>px <?php echo $previewModel->getData('conf/fonts/Title9/name'); ?>;color:<?php echo $previewModel->getData('conf/fonts/Title9/color'); ?>;<?php echo $categoryItemTintColor; ?>"><?php echo $this->__("80x80 px"); ?></div>
         </div>
-        <div class="item" style="background:<?php echo $this->getData('conf/categoryItem/backgroundColor'); ?>">
-            <img src="<?php echo $this->getPreviewImagesUrl('men.png') ?>" width="80" height="80" alt="" />
-            <div class="item-text" style="font:bold <?php echo $this->getData('conf/fonts/Title9/size'); ?>px <?php echo $this->getData('conf/fonts/Title9/name'); ?>;color:<?php echo $this->getData('conf/fonts/Title9/color'); ?>;<?php echo $categoryItemTintColor; ?>"><?php echo $this->__("80x80 px"); ?></div>
+        <div class="item" style="background:<?php echo $previewModel->getData('conf/categoryItem/backgroundColor'); ?>">
+            <img src="<?php echo $previewModel->getPreviewImagesUrl('men.png') ?>" width="80" height="80" alt="" />
+            <div class="item-text" style="font:bold <?php echo $previewModel->getData('conf/fonts/Title9/size'); ?>px <?php echo $previewModel->getData('conf/fonts/Title9/name'); ?>;color:<?php echo $previewModel->getData('conf/fonts/Title9/color'); ?>;<?php echo $categoryItemTintColor; ?>"><?php echo $this->__("80x80 px"); ?></div>
         </div>
         <div class="item" style="background:<?php echo $this->getData('conf/categoryItem/backgroundColor'); ?>">
             <img src="<?php echo $this->getPreviewImagesUrl('men.png') ?>" width="80" height="80" alt="" />
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_android.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_android.phtml
index 8487a7741c..55cda67340 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_android.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_android.phtml
@@ -24,13 +24,17 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php if (($buttons = $this->getTabItems()) && is_array($buttons) && ($buttonsCount = count($buttons))) :?>
+<?php
+    /** @var $previewModel Mage_XmlConnect_Model_Preview_Android */
+    $previewModel = Mage::helper('xmlconnect')->getPreviewModel();
+?>
+<?php if (($buttons = $previewModel->getTabItems()) && is_array($buttons) && ($buttonsCount = count($buttons))) :?>
             <?php foreach ($buttons as $button) : ?>
                 <?php if ($button['action'] == 'Account') :?>
-                <div class="icon icon-account"></div>
+                <div class="icon icon-account">B</div>
                 <?php endif; ?>
                 <?php if ($button['action'] == 'Search') :?>
-                <div class="icon icon-search"></div>
+                <div class="icon icon-search">C</div>
                 <?php endif; ?>
             <?php endforeach; ?>
 <?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_ipad.phtml
index e0f0102afe..16cbac0c7e 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_ipad.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_ipad.phtml
@@ -25,18 +25,20 @@
  */
 ?>
 <?php
-$title1color = $this->getData('conf/fonts/Title1/color');
+/** @var $previewModel Mage_XmlConnect_Model_Preview_Ipad */
+$previewModel = Mage::helper('xmlconnect')->getPreviewModel();
+$title1color = $previewModel->getData('conf/fonts/Title1/color');
 ?>
-<?php if ($this->isItemExists('Cart')) :?>
-    <span class="cart" style="color:<?php echo $title1color; ?>;"><img src="<?php echo $this->getPreviewImagesUrl('ipad/i_cart.png') ?>" alt="" /></span>
+<?php if ($previewModel->isItemExists('Cart')) :?>
+    <span class="cart" style="color:<?php echo $title1color; ?>;"><img src="<?php echo $previewModel->getPreviewImagesUrl('ipad/i_cart.png') ?>" alt="" /></span>
 <?php endif; ?>
-<?php if ($this->isItemExists('Account')) :?>
-    <span class="login" style="color:<?php echo $title1color; ?>;"><img src="<?php echo $this->getPreviewImagesUrl('ipad/i_login.png') ?>" alt="" /></span>
+<?php if ($previewModel->isItemExists('Account')) :?>
+    <span class="login" style="color:<?php echo $title1color; ?>;"><img src="<?php echo $previewModel->getPreviewImagesUrl('ipad/i_login.png') ?>" alt="" /></span>
 <?php endif; ?>
 
-<span class="info"><img src="<?php echo $this->getPreviewImagesUrl('ipad/i_info.png') ?>" alt="" /></span>
+<span class="info"><img src="<?php echo $previewModel->getPreviewImagesUrl('ipad/i_info.png') ?>" alt="" /></span>
 
-<span class="logo"><img src="<?php echo $this->getLogoUrl(); ?>" height="14" width="12" alt="" /></span><span class="store-name" style="color:<?php echo $title1color; ?>;">Magento</span>
-<?php if ($this->isItemExists('Search')) :?>
-    <span class="search"><img src="<?php echo $this->getPreviewImagesUrl('ipad/bg_search.png') ?>" alt="" /></span>
+<span class="app-logo"><img src="<?php echo $previewModel->getLogoUrl(); ?>" height="14" width="12" alt="" /></span><span class="store-name" style="color:<?php echo $title1color; ?>;">Magento</span>
+<?php if ($previewModel->isItemExists('Search')) :?>
+    <span class="search"><img src="<?php echo $previewModel->getPreviewImagesUrl('ipad/bg_search.png') ?>" alt="" /></span>
 <?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_iphone.phtml
old mode 100644
new mode 100755
similarity index 85%
rename from app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items.phtml
rename to app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_iphone.phtml
index dd054d23cd..10ec68616f
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview/tab_items_iphone.phtml
@@ -24,7 +24,12 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php if (($buttons = $this->getTabItems()) && is_array($buttons) && ($buttonsCount = count($buttons))) :?>
+<?php
+    /** @var $previewModel Mage_XmlConnect_Model_Preview_Iphone */
+    $previewModel = Mage::helper('xmlconnect')->getPreviewModel();
+?>
+<?php if (($buttons = $previewModel->getTabItems()) && is_array($buttons) && ($buttonsCount = count($buttons))) :?>
+
 <div class="bottom-buttons">
     <div class="gradient">
     <table width="100%">
@@ -39,6 +44,6 @@
             </tr>
         </tbody>
     </table>
-    </div>  
+    </div>
 </div>
 <?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_android.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_android.phtml
index 8f1e957005..f3a5c9b2fb 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_android.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_android.phtml
@@ -25,14 +25,13 @@
  */
 ?>
 <?php
-    $deviceType = Mage::helper('xmlconnect')->getApplication()->getType();
+    $deviceType = Mage::helper('xmlconnect')->getDeviceType();
 ?>
-<div id="XmlconnectThemePreview">
-    <iframe src="about:blank" id="XmlconnectThemePreviewIframe" name="XmlconnectThemePreviewIframe" frameborder="0" scrolling="no" style="width: 328px; height: 490px; border: 0; "></iframe>
-</div>
+<div id="XmlconnectThemePreview"></div>
 
 <div class="mm-box-blue a-center" style="width:285px;">
     <button type="button" class="scalable" onclick="updatePreview()"><span><?php echo $this->__('Update Preview');?></span></button>
+    <p><br />To preview the newly uploaded images, please save your application first.</p>
 </div>
 <div class="mm-pager">
     <strong><?php echo $this->__('Screens:'); ?></strong>
@@ -42,16 +41,39 @@
     </ul>
 </div>
 <script type="text/javascript">
-
+previewIframe = $('XmlconnectThemePreview');
+// submit application flag
+mmPreviewPagePrefix = '';
 mmPreviewPage = '<?php echo $this->getPreviewActionUrl('home'); ?>';
 function updatePreview(someAction) {
-    saveAction = $('edit_form').action;
-    $('edit_form').action = mmPreviewPage + (someAction ? someAction : '');
-    $('edit_form').target = 'XmlconnectThemePreviewIframe';
-    $('edit_form').submit();
-    // FIXME
-    $('edit_form').action = saveAction;
-    $('edit_form').target = '';
+    previewIframe.update('<?php echo $this->__('Loading Preview...'); ?>').addClassName('preview-loading');
+    new Ajax.Request(mmPreviewPage + (someAction ? someAction : '') + mmPreviewPagePrefix, {
+        parameters: $('edit_form').serialize(true),
+        onSuccess : function(transport) {
+            try{
+                if (transport.responseText.isJSON()) {
+                    var response = transport.responseText.evalJSON()
+                    if (response.error) {
+                        alert(response.message);
+                    }
+                    if(response.ajaxExpired && response.ajaxRedirect) {
+                        setLocation(response.ajaxRedirect);
+                    }
+                } else {
+                    previewIframe.removeClassName('preview-loading').update(transport.responseText);
+                }
+            } catch (e) {
+                alert(transport.responseText);
+            }
+
+            if (!response.success) {
+                var msg = response.error_message;
+                if (msg) {
+                    alert(msg);
+                }
+            }
+        }
+    });
 }
 function resetPager() {
     $('mmPager').childElements().each(function(t){
@@ -81,7 +103,8 @@ Event.observe(document, 'dom:loaded', function() {
         });
     } else {
         // 1 is correct value - tells that you don't need to load app data
-        $('XmlconnectThemePreviewIframe').src = mmPreviewPage + 'submission_action/1/';
+        mmPreviewPagePrefix = 'submission_action/1/';
+        updatePreview();
     }
 });
 
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_ipad.phtml
index 2a40fb8cb2..fce8d16e61 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_ipad.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_ipad.phtml
@@ -25,7 +25,7 @@
  */
 ?>
 <?php
-    $deviceType = Mage::helper('xmlconnect')->getApplication()->getType();
+    $deviceType = Mage::helper('xmlconnect')->getDeviceType();
 
     $homeFlag = 'home';
     $catalogFlag = 'catalog';
@@ -36,13 +36,12 @@
     $homeHorAction = $this->getPreviewActionUrl($homeHorFlag);
     $catalogHorAction = $this->getPreviewActionUrl($catalogHorFlag);
 ?>
-<div id="XmlconnectThemePreview">
-    <iframe src="about:blank" id="XmlconnectThemePreviewIframe" name="XmlconnectThemePreviewIframe" class="ipad-portrait" frameborder="0" scrolling="no"></iframe>
-</div>
+<div id="XmlconnectThemePreview" class="ipad-portrait"></div>
 
 <div id="ipad-tab-orientation" class="mm-box-blue a-center ipad-tab-portrait">
     <button type="button" class="scalable" onclick="updatePreview()"><span><?php echo $this->__('Update Preview');?></span></button>
     <button type="button" class="scalable" onclick="changeOrientation()"><span><?php echo $this->__('Change Orientation');?></span></button>
+    <p><br />To preview the newly uploaded images, please save your application first.</p>
 </div>
 <div class="mm-pager" style="padding-left:60px;">
     <strong><?php echo $this->__('Screens:'); ?></strong>
@@ -58,8 +57,10 @@
 <script type="text/javascript">
 mmPreviewPage = '<?php echo $homeAction; ?>';
 mmPreviewFlag = '<?php echo $homeFlag ?>';
-previewFrame = $('XmlconnectThemePreviewIframe');
+previewIframe = $('XmlconnectThemePreview');
 ipadTabOrientn = $('ipad-tab-orientation');
+// submit application flag
+mmPreviewPagePrefix = '';
 function changeOrientation() {
     $('mmPager').toggle();
     $('mmPager2').toggle();
@@ -82,24 +83,45 @@ function changeOrientation() {
         mmPreviewFlag = '<?php echo $catalogFlag ?>';
     }
 
-        previewFrame.removeClassName((flagOrient ? 'ipad-portrait' : 'ipad-horizontal'))
-            .addClassName((flagOrient ? 'ipad-horizontal' : 'ipad-portrait'));
-        ipadTabOrientn.removeClassName((flagOrient ? 'ipad-tab-portrait' : 'ipad-tab-horizontal'))
-            .addClassName((flagOrient ? 'ipad-tab-horizontal' : 'ipad-tab-portrait'));
+        previewIframe.removeClassName((flagOrient ? 'ipad-portrait' : 'ipad-landscape'))
+            .addClassName((flagOrient ? 'ipad-landscape' : 'ipad-portrait'));
+        ipadTabOrientn.removeClassName((flagOrient ? 'ipad-tab-portrait' : 'ipad-tab-landscape'))
+            .addClassName((flagOrient ? 'ipad-tab-landscape' : 'ipad-tab-portrait'));
 
     resetPager();
     $(mmPreviewFlag).addClassName('active');
     updatePreview();
 }
-
 function updatePreview(someAction) {
-    saveAction = $('edit_form').action;
-    $('edit_form').action = mmPreviewPage + (someAction ? someAction : '');
-    $('edit_form').target = 'XmlconnectThemePreviewIframe';
-    $('edit_form').submit();
-    // FIXME
-    $('edit_form').action = saveAction;
-    $('edit_form').target = '';
+    var loadingClassName = previewIframe.className + '-loading';
+    previewIframe.update('<?php echo $this->__('Loading Preview...'); ?>').addClassName(loadingClassName);
+    new Ajax.Request(mmPreviewPage + (someAction ? someAction : '') + mmPreviewPagePrefix, {
+        parameters: $('edit_form').serialize(true),
+        onSuccess : function(transport) {
+            try{
+                if (transport.responseText.isJSON()) {
+                    var response = transport.responseText.evalJSON()
+                    if (response.error) {
+                        alert(response.message);
+                    }
+                    if(response.ajaxExpired && response.ajaxRedirect) {
+                        setLocation(response.ajaxRedirect);
+                    }
+                } else {
+                    previewIframe.removeClassName(loadingClassName).update(transport.responseText);
+                }
+            } catch (e) {
+                alert(transport.responseText);
+            }
+
+            if (!response.success) {
+                var msg = response.error_message;
+                if (msg) {
+                    alert(msg);
+                }
+            }
+        }
+    });
 }
 function resetPager() {
     $('mmPager').childElements().each(function(t){
@@ -140,7 +162,8 @@ Event.observe(document, 'dom:loaded', function() {
         });
     } else {
         // 1 is correct value - tells that you don't need to load app data
-        $('XmlconnectThemePreviewIframe').src = mmPreviewPage + 'submission_action/1/';
+        mmPreviewPagePrefix = 'submission_action/1/';
+        updatePreview();
     }
 });
 
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_iphone.phtml b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_iphone.phtml
index b82b5afb6a..4d5cf72ef0 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_iphone.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design/preview_iphone.phtml
@@ -25,14 +25,13 @@
  */
 ?>
 <?php
-    $deviceType = Mage::helper('xmlconnect')->getApplication()->getType();
+    $deviceType = Mage::helper('xmlconnect')->getDeviceType();
 ?>
-<div id="XmlconnectThemePreview">
-        <iframe src="about:blank" id="XmlconnectThemePreviewIframe" name="XmlconnectThemePreviewIframe" frameborder="0" scrolling="no" style="width: 328px; height: 490px; border: 0; "></iframe>
-</div>
+<div id="XmlconnectThemePreview"></div>
 
 <div class="mm-box-blue a-center" style="width:285px;">
     <button type="button" class="scalable" onclick="updatePreview()"><span><?php echo $this->__('Update Preview');?></span></button>
+    <p><br />To preview the newly uploaded images, please save your application first.</p>
 </div>
 <div class="mm-pager">
     <strong><?php echo $this->__('Screens:'); ?></strong>
@@ -43,17 +42,41 @@
     </ul>
 </div>
 <script type="text/javascript">
-
+previewIframe = $('XmlconnectThemePreview');
+// submit application flag
+mmPreviewPagePrefix = '';
 mmPreviewPage = '<?php echo $this->getPreviewActionUrl('home'); ?>';
 function updatePreview(someAction) {
-    saveAction = $('edit_form').action;
-    $('edit_form').action = mmPreviewPage + (someAction ? someAction : '');
-    $('edit_form').target = 'XmlconnectThemePreviewIframe';
-    $('edit_form').submit();
-    // FIXME
-    $('edit_form').action = saveAction;
-    $('edit_form').target = '';
+    previewIframe.update('<?php echo $this->__('Loading Preview...'); ?>').addClassName('preview-loading');
+    new Ajax.Request(mmPreviewPage + (someAction ? someAction : '') + mmPreviewPagePrefix, {
+        parameters: $('edit_form').serialize(true),
+        onSuccess : function(transport) {
+            try{
+                if (transport.responseText.isJSON()) {
+                    var response = transport.responseText.evalJSON()
+                    if (response.error) {
+                        alert(response.message);
+                    }
+                    if(response.ajaxExpired && response.ajaxRedirect) {
+                        setLocation(response.ajaxRedirect);
+                    }
+                } else {
+                    previewIframe.removeClassName('preview-loading').update(transport.responseText);
+                }
+            } catch (e) {
+                alert(transport.responseText);
+            }
+
+            if (!response.success) {
+                var msg = response.error_message;
+                if (msg) {
+                    alert(msg);
+                }
+            }
+        }
+    });
 }
+
 function resetPager() {
     $('mmPager').childElements().each(function(t){
         t.down('a').removeClassName('active');
@@ -82,7 +105,8 @@ Event.observe(document, 'dom:loaded', function() {
         });
     } else {
         // 1 is correct value - tells that you don't need to load app data
-        $('XmlconnectThemePreviewIframe').src = mmPreviewPage + 'submission_action/1/';
+        mmPreviewPagePrefix = 'submission_action/1/';
+        updatePreview();
     }
 });
 
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs.phtml b/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs.phtml
deleted file mode 100644
index fd37b6b910..0000000000
--- a/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs.phtml
+++ /dev/null
@@ -1,334 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     default_default
- * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<script type="text/javascript">
-// <![CDATA[
-
-// tabNumber:
-//  * 0, 1, 2  main tabs
-//  * 3, ...  active tabs
-
-// disabledTabNumber — another numbers
-
-enabledTabs = <?php echo Mage::helper('core')->jsonEncode($this->getTabs()->getEnabledTabs()); ?>
-
-disabledTabs = <?php echo Mage::helper('core')->jsonEncode($this->getTabs()->getDisabledTabs()); ?>
-
-disabledTabsMaxCount = 5;
-visibleTabsCount = 5;
-moreActionText = 'More';
-
-function XmlconnectTabUpdate() {
-    for(i=0; i<10; i++) {
-        tags=document.getElementsByClassName('mm_tab'+i)
-        for(j=0; j<tags.length; j++) {
-            isActive = i<enabledTabs.length
-            isMore = false
-            if(enabledTabs[i] && (enabledTabs[i].action==moreActionText)) {
-                isMore = true
-            }
-            if(isActive) {
-                // Enabled tabs
-                if(tags[j].className.indexOf('mm_img')>0) {
-                    tags[j].innerHTML = '<img src="<?php echo Mage::helper('xmlconnect/image')->getSkinImagesUrl(); ?>'+enabledTabs[i].image+'" alt="" />'
-                    tags[j].style.visibility = 'visible'
-                }
-                if(tags[j].className.indexOf('mm_name')>0) {
-                    tags[j].innerHTML = '<span>'+enabledTabs[i].label+'</span>'
-                }
-                if(tags[j].className.indexOf('mm_ctrl')>0) {
-                    tags[j].style.visibility = isMore? 'hidden': 'visible'
-                }
-            } else {
-                // Empty places
-                if(tags[j].className.indexOf('mm_img')>0) {
-                    tags[j].innerHTML = '<img src="<?php echo Mage::helper('xmlconnect/image')->getSkinImagesUrl('tab_empty.png'); ?>" alt="" />'
-                    tags[j].style.visibility = 'hidden'
-                }
-                if(tags[j].className.indexOf('mm_name')>0) {
-                    tags[j].innerHTML = ''
-                }
-                if(tags[j].className.indexOf('mm_ctrl')>0) {
-                    tags[j].style.visibility = 'hidden';
-                }
-            }
-        }
-    }
-    for(i=0; i<disabledTabsMaxCount; i++) {
-        tags=document.getElementsByClassName('mmd_tab'+i)
-        for(j=0; j<tags.length; j++) {
-            if(i<disabledTabs.length && disabledTabs[i] && (disabledTabs[i].action != moreActionText)) {
-                // Disabled tabs
-                if(tags[j].className.indexOf('mm_img')>0) {
-                    tags[j].innerHTML = '<img src="<?php echo Mage::helper('xmlconnect/image')->getSkinImagesUrl(); ?>'+disabledTabs[i].image+'" alt="" />'
-                    tags[j].style.visibility = 'visible'
-                }
-                if(tags[j].className.indexOf('mm_name')>0) {
-                    tags[j].innerHTML = disabledTabs[i].label
-                }
-                if(tags[j].className.indexOf('mm_ctrl')>0) {
-                    tags[j].style.visibility = 'visible'
-                }
-            } else {
-                // Empty places
-                if(tags[j].className.indexOf('mm_img')>0) {
-                    tags[j].innerHTML = '<img src="<?php echo Mage::helper('xmlconnect/image')->getSkinImagesUrl('tab_empty.png'); ?>" alt="" />'
-                    tags[j].style.visibility = 'hidden'
-                }
-                if(tags[j].className.indexOf('mm_name')>0) {
-                    tags[j].innerHTML = ''
-                }
-                if(tags[j].className.indexOf('mm_ctrl')>0) {
-                    tags[j].style.visibility = 'hidden'
-                }
-            }
-        }
-    }
-    document.getElementById('<?php echo htmlspecialchars($this->getName()); ?>').value = Object.toJSON({"enabledTabs": enabledTabs, "disabledTabs": disabledTabs})
-}
-
-document.observe("dom:loaded", function() {
-    XmlconnectTabUpdate();
-});
-
-function XmlconnectTabMove(tab1, tab2) {
-    directionLeft = tab1 > tab2;
-    if (enabledTabs[tab1] && (enabledTabs[tab1].action == moreActionText)) {
-        return;
-    }
-    if (enabledTabs[tab2] && (enabledTabs[tab2].action == moreActionText)) {
-        tab2 = directionLeft ? tab2 - 1 : tab2 + 1;
-    }
-    if(tab1>=enabledTabs.length) {
-        return;
-    }
-    if(tab2>=enabledTabs.length) {
-        return;
-    }
-
-    tmp = enabledTabs[tab1]
-    enabledTabs[tab1] = enabledTabs[tab2]
-    enabledTabs[tab2] = tmp
-    XmlconnectTabUpdate()
-}
-
-function XmlconnectTabEnable(disabledTabNumber) {
-    enabledTabs.push(disabledTabs.splice(disabledTabNumber, 1).shift());
-    insertMore(fetchMore());
-    XmlconnectTabUpdate();
-    return false;
-}
-
-function XmlconnectTabDisable(tabNumber) {
-    tabActionText = '';
-    if (enabledTabs[tabNumber]) {
-        tabActionText = enabledTabs[tabNumber].action;
-    }
-    tabMore = fetchMore();
-    if(disabledTabs.length >= disabledTabsMaxCount) {
-        disabledTabs.push(tabMore);
-        return false;
-    }
-    /**
-     * Correct tabNumber value after possible change enabledTab array by using fetchMore() function.
-     */
-    for (i = 0; i < enabledTabs.length; i++) {
-        if (enabledTabs[i].action == tabActionText) {
-            tabNumber = i;
-            break;
-        }
-    }
-    disabledTabs.push(enabledTabs.splice(tabNumber, 1).shift());
-    insertMore(tabMore);
-    XmlconnectTabUpdate();
-    return false;
-}
-
-
-/**
- * Insert "tab more" on last visible position
- * if enabled more than visible tabs
- *
- * @param Object tabMore
- * @return bool
- */
-function insertMore(tabMore) {
-    if (enabledTabs.length > visibleTabsCount) {
-        enabledTabsMoreArray = enabledTabs.splice(visibleTabsCount-1, enabledTabs.length - (visibleTabsCount - 1));
-
-        enabledTabs.push(tabMore);
-        while (enabledTabsMoreArray.length) {
-            enabledTabs.push(enabledTabsMoreArray.shift());
-        }
-    } else {
-        disabledTabs.push(tabMore);
-    }
-    return false;
-}
-
-/**
- * Fetch "tab more" from enabledTab or disabledTab arrays
- *
- * @return Object|null
- */
-function fetchMore() {
-    for (i=0; i < enabledTabs.length; i++) {
-        if (enabledTabs[i] && (enabledTabs[i].action == moreActionText)) {
-            return enabledTabs.splice(i, 1).shift();
-        }
-    }
-    for (i=0; i < disabledTabs.length; i++) {
-        if (disabledTabs[i] && (disabledTabs[i].action == moreActionText)) {
-            return disabledTabs.splice(i, 1).shift();
-        }
-    }
-    return null;
-}
-// ]]>
-</script>
-
-<tr><td>
-
-<input type="hidden"
-    name="<?php echo htmlspecialchars($this->getName()); ?>"
-    id="<?php echo htmlspecialchars($this->getName()); ?>"
-    value="<?php echo htmlspecialchars($this->getValue()); ?>" />
-
-<div class="mm-tabs-title"><?php echo Mage::helper('xmlconnect')->__('Main Tabs') ?></div>
-<table border="0">
-    <tr>
-        <td width="20%" align="center" valign="bottom" class="mm_tab0 mm_img"> </td>
-        <td width="20%" align="center" valign="bottom" class="mm_tab1 mm_img"> </td>
-        <td width="20%" align="center" valign="bottom" class="mm_tab2 mm_img"> </td>
-        <td width="20%" align="center" valign="bottom" class="mm_tab3 mm_img"> </td>
-        <td width="20%" align="center" valign="bottom" class="mm_tab4 mm_img"> </td>
-    </tr>
-    <tr>
-        <td align="center" class="mm_tab0 mm_name"><span><?php echo Mage::helper('xmlconnect')->__('Home'); ?></span></td>
-        <td align="center" class="mm_tab1 mm_name"> </td>
-        <td align="center" class="mm_tab2 mm_name"> </td>
-        <td align="center" class="mm_tab3 mm_name"> </td>
-        <td align="center" class="mm_tab4 mm_name"> </td>
-    </tr>
-    <tr>
-        <td><!-- Home tab == fixed place --></td>
-        <td align="center" valign="top" class="mm_tab1 mm_ctrl">
-            <input type="button"  class="m-arrows full-arrow" value="&rarr;" onclick="XmlconnectTabMove(1,2)" />
-        </td>
-        <td align="center" valign="top" class="mm_tab2 mm_ctrl">
-            <input type="button" class="m-arrows l-arrow" value="&larr;" onclick="XmlconnectTabMove(2,1)" />
-            <input type="button"  class="m-arrows r-arrow" value="&rarr;" onclick="XmlconnectTabMove(2,3)" />
-        </td>
-        <td align="center" valign="top" class="mm_tab3 mm_ctrl">
-            <input type="button" class="m-arrows l-arrow" value="&larr;" onclick="XmlconnectTabMove(3,2)" />
-            <input type="button"  class="m-arrows r-arrow" value="&rarr;" onclick="XmlconnectTabMove(3,4)" />
-        </td>
-        <td align="center" valign="top" class="mm_tab4 mm_ctrl">
-            <input type="button" class="m-arrows l-arrow" value="&larr;" onclick="XmlconnectTabMove(4,3)" />
-            <input type="button"  class="m-arrows r-arrow" value="&rarr;" onclick="XmlconnectTabMove(4,5)" />
-        </td>
-    </tr>
-    <tr>
-        <td><!-- Home tab == always active --></td>
-        <td align="center" class="mm_tab1 mm_ctrl"><a href="#" onclick="return XmlconnectTabDisable(1)"><?php echo Mage::helper('xmlconnect')->__('Make Inactive'); ?></a></td>
-        <td align="center" class="mm_tab2 mm_ctrl"><a href="#" onclick="return XmlconnectTabDisable(2)"><?php echo Mage::helper('xmlconnect')->__('Make Inactive'); ?></a></td>
-        <td align="center" class="mm_tab3 mm_ctrl"><a href="#" onclick="return XmlconnectTabDisable(3)"><?php echo Mage::helper('xmlconnect')->__('Make Inactive'); ?></a></td>
-        <td align="center" class="mm_tab4 mm_ctrl"><a href="#" onclick="return XmlconnectTabDisable(4)"><?php echo Mage::helper('xmlconnect')->__('Make Inactive'); ?></a></td>
-    </tr>
-</table>
-<div class="mm-tabs-title"><?php echo Mage::helper('xmlconnect')->__('More Tabs') ?></div>
-<table border="0">
-    <tr>
-        <td width="20%" align="center" valign="bottom" class="mm_tab5 mm_img"> </td>
-        <td width="20%" align="center" valign="bottom" class="mm_tab6 mm_img"> </td>
-        <td width="20%" align="center" valign="bottom" class="mm_tab7 mm_img"> </td>
-        <td width="20%" align="center" valign="bottom" class="mm_tab8 mm_img"> </td>
-        <td width="20%" align="center" valign="bottom" class="mm_tab9 mm_img"> </td>
-    </tr>
-    <tr>
-        <td align="center" class="mm_tab5 mm_name"> </td>
-        <td align="center" class="mm_tab6 mm_name"> </td>
-        <td align="center" class="mm_tab7 mm_name"> </td>
-        <td align="center" class="mm_tab8 mm_name"> </td>
-        <td align="center" class="mm_tab9 mm_name"> </td>
-    </tr>
-    <tr>
-        <td align="center" valign="top" class="mm_tab5 mm_ctrl">
-            <input type="button" class="m-arrows l-arrow" value="&larr;" onclick="XmlconnectTabMove(5,4)" />
-            <input type="button" class="m-arrows r-arrow" value="&rarr;" onclick="XmlconnectTabMove(5,6)" />
-        </td>
-        <td align="center" valign="top" class="mm_tab6 mm_ctrl">
-            <input type="button" class="m-arrows l-arrow" value="&larr;" onclick="XmlconnectTabMove(6,5)" />
-            <input type="button" class="m-arrows r-arrow" value="&rarr;" onclick="XmlconnectTabMove(6,7)" />
-        </td>
-        <td align="center" valign="top" class="mm_tab7 mm_ctrl">
-            <input type="button" class="m-arrows l-arrow" value="&larr;" onclick="XmlconnectTabMove(7,6)" />
-            <input type="button" class="m-arrows r-arrow" value="&rarr;" onclick="XmlconnectTabMove(7,8)" />
-        </td>
-        <td align="center" valign="top" class="mm_tab8 mm_ctrl">
-            <input type="button" class="m-arrows l-arrow" value="&larr;" onclick="XmlconnectTabMove(8,7)" />
-            <input type="button" class="m-arrows r-arrow" value="&rarr;" onclick="XmlconnectTabMove(8,9)" />
-        </td>
-        <td align="center" valign="top" class="mm_tab9 mm_ctrl">
-            <input type="button" class="m-arrows l-arrow" value="&larr;" onclick="XmlconnectTabMove(9,8)" />
-            <input type="button" class="m-arrows r-arrow" value="&rarr;" onclick="" />
-        </td>
-    </tr>
-    <tr>
-        <td align="center" class="mm_tab5 mm_ctrl"><a href="#" onclick="return XmlconnectTabDisable(5)"><?php echo Mage::helper('xmlconnect')->__('Make Inactive'); ?></a></td>
-        <td align="center" class="mm_tab6 mm_ctrl"><a href="#" onclick="return XmlconnectTabDisable(6)"><?php echo Mage::helper('xmlconnect')->__('Make Inactive'); ?></a></td>
-        <td align="center" class="mm_tab7 mm_ctrl"><a href="#" onclick="return XmlconnectTabDisable(7)"><?php echo Mage::helper('xmlconnect')->__('Make Inactive'); ?></a></td>
-        <td align="center" class="mm_tab8 mm_ctrl"><a href="#" onclick="return XmlconnectTabDisable(8)"><?php echo Mage::helper('xmlconnect')->__('Make Inactive'); ?></a></td>
-        <td align="center" class="mm_tab9 mm_ctrl"><a href="#" onclick="return XmlconnectTabDisable(9)"><?php echo Mage::helper('xmlconnect')->__('Make Inactive'); ?></a></td>
-    </tr>
-</table>
-<div class="mm-tabs-title"><?php Mage::helper('xmlconnect')->__('Inactive Tabs'); ?></div>
-<table border="0">
-    <tr>
-        <td width="20%" align="center" valign="bottom" class="mmd_tab0 mm_img" style="opacity: .5"> </td>
-        <td width="20%" align="center" valign="bottom" class="mmd_tab1 mm_img" style="opacity: .5"> </td>
-        <td width="20%" align="center" valign="bottom" class="mmd_tab2 mm_img" style="opacity: .5"> </td>
-        <td width="20%" align="center" valign="bottom" class="mmd_tab3 mm_img" style="opacity: .5"> </td>
-        <td width="20%" align="center" valign="bottom" class="mmd_tab4 mm_img" style="opacity: .5"> </td>
-    </tr>
-    <tr>
-        <td align="center" class="mmd_tab0 mm_name"> </td>
-        <td align="center" class="mmd_tab1 mm_name"> </td>
-        <td align="center" class="mmd_tab2 mm_name"> </td>
-        <td align="center" class="mmd_tab3 mm_name"> </td>
-        <td align="center" class="mmd_tab4 mm_name"> </td>
-    </tr>
-    <tr>
-        <td align="center" class="mmd_tab0 mm_ctrl"><a href="#" onclick="return XmlconnectTabEnable(0)"><?php echo Mage::helper('xmlconnect')->__('Activate'); ?></a></td>
-        <td align="center" class="mmd_tab1 mm_ctrl"><a href="#" onclick="return XmlconnectTabEnable(1)"><?php echo Mage::helper('xmlconnect')->__('Activate'); ?></a></td>
-        <td align="center" class="mmd_tab2 mm_ctrl"><a href="#" onclick="return XmlconnectTabEnable(2)"><?php echo Mage::helper('xmlconnect')->__('Activate'); ?></a></td>
-        <td align="center" class="mmd_tab3 mm_ctrl"><a href="#" onclick="return XmlconnectTabEnable(3)"><?php echo Mage::helper('xmlconnect')->__('Activate'); ?></a></td>
-        <td align="center" class="mmd_tab4 mm_ctrl"><a href="#" onclick="return XmlconnectTabEnable(4)"><?php echo Mage::helper('xmlconnect')->__('Activate'); ?></a></td>
-    </tr>
-</table>
-
-</td></tr>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs_ipad.phtml b/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs_ipad.phtml
index ae740109c0..596723ee77 100755
--- a/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs_ipad.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/form/element/app_tabs_ipad.phtml
@@ -143,7 +143,7 @@ function XmlconnectTabDisable(tabNumber) {
     id="<?php echo htmlspecialchars($this->getName()); ?>"
     value="<?php echo htmlspecialchars($this->getValue()); ?>" />
 
-<div class="mm-tabs-title"><?php echo $this->__('Main Tabs') ?></div>
+<br/>
 <table border="0">
     <tr>
         <td width="20%" align="center" valign="bottom" class="mm_tab0 mm_img"> </td>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/form/element/country/androidmarket.phtml b/app/design/adminhtml/default/default/template/xmlconnect/form/element/country/androidmarket.phtml
new file mode 100644
index 0000000000..704fea3362
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/xmlconnect/form/element/country/androidmarket.phtml
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+$element = $this->getElement();
+$note    = $element->getNote();
+$trId    = $element->getHtmlContainerId();
+$class   = $element->getFieldsetHtmlClass();
+?>
+<?php if (!$element->getNoDisplay()): ?>
+<tr<?php if($trId): ?> id="<?php echo $trId ?>"<?php endif; ?>>
+    <td class="label<?php echo $class ? " {$class}-label" : ''?>"><?php echo $element->getLabelHtml() ?></td>
+    <td class="<?php echo $element->hasValueClass() ? $element->getValueClass() : 'value' ?><?php echo $class ? " {$class}-value" : ''?>">
+        <div id="countries-control">
+            <input type="checkbox" id="select-all" />
+                <label for="select-all">
+                    <strong><?php echo $this->__('All locations'); ?></strong>
+                </label>
+        </div>
+        <p class="note">
+            <?php echo $this->__('(Includes more countries than those listed below. As the application owner, you are responsible for complying with country-specific laws related to the distribution or sale of your application into that country, including your home country.)'); ?>
+        </p>
+        <?php echo $element->getElementHtml(); ?>
+        <?php if ($note): ?>
+            <p class="note<?php echo $class ? " {$class}-note" : ''?>" id="note_<?php echo $element->getId(); ?>">
+                <span><?php echo $note ?></span>
+            </p>
+        <?php endif ?>
+        <script type="text/javascript">
+            function checkCountryValues(click) {
+                if (click) {
+                    isChecked = $('select-all').checked;
+                    $$('#submission-countries-table input[@type=checkbox]').each(
+                        function(elm) {
+                            if (isChecked && !elm.checked) {
+                                elm.checked = true;
+                            } else if (!isChecked && elm.checked) {
+                                elm.checked = false;
+                            }
+                        }
+                        );
+                    if (isChecked) {
+                        $('submission-countries-table').hide();
+                    } else if (!isChecked) {
+                        $('submission-countries-table').show();
+                    }
+                } else {
+                    checkboxCount = $$('#submission-countries-table input[@type=checkbox]').length;
+                    countEnabled = 0;
+                    $$('#submission-countries-table input[@type=checkbox]').each(
+                        function(elm) {
+                            if (elm.checked) {
+                                countEnabled++;
+                            }
+                        }
+                    );
+                    if (countEnabled == checkboxCount) {
+                        $('select-all').checked = true;
+                        $('submission-countries-table').hide();
+                    }
+                }
+            }
+            checkCountryValues(false);
+
+            $('select-all').observe('click', function() {
+                checkCountryValues(true);
+            });
+        </script>
+    </td>
+</tr>
+<?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/form/element/country/istore.phtml b/app/design/adminhtml/default/default/template/xmlconnect/form/element/country/istore.phtml
new file mode 100644
index 0000000000..bb98b155c6
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/xmlconnect/form/element/country/istore.phtml
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+$element = $this->getElement();
+$note    = $element->getNote();
+$trId    = $element->getHtmlContainerId();
+$class   = $element->getFieldsetHtmlClass();
+?>
+<?php if (!$element->getNoDisplay()): ?>
+<tr<?php if($trId): ?> id="<?php echo $trId ?>"<?php endif; ?>>
+    <td class="label<?php echo $class ? " {$class}-label" : ''?>"><?php echo $element->getLabelHtml() ?></td>
+    <td class="<?php echo $element->hasValueClass() ? $element->getValueClass() : 'value' ?><?php echo $class ? " {$class}-value" : ''?>">
+        <div id="countries-control" class="istore-buttons-set">
+            <span id="select-all" class="form-button"><span><?php echo $this->__('Select All'); ?></span></span>
+            <span id="deselect-all" class="form-button"><span><?php echo $this->__('Deselect All'); ?></span></span>
+        </div>
+        <?php echo $element->getElementHtml(); ?>
+        <?php if ($note): ?>
+            <p class="note<?php echo $class ? " {$class}-note" : ''?>" id="note_<?php echo $element->getId()?>">
+                <span><?php echo $note ?></span>
+            </p>
+        <?php endif ?>
+        <script type="text/javascript">
+            $('select-all').observe('click', function() {
+                $$('#submission-countries-table input[@type=checkbox]').each(
+                    function(elm) {
+                        if (!elm.checked) {
+                            elm.checked = true;
+                        }
+                    }
+                );
+            });
+            $('deselect-all').observe('click', function() {
+                $$('#submission-countries-table input[@type=checkbox]').each(
+                    function(elm) {
+                        if (elm.checked) {
+                            elm.checked = false;
+                        }
+                    }
+                );
+            });
+        </script>
+    </td>
+</tr>
+<?php endif; ?>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/form/element/themes.phtml b/app/design/adminhtml/default/default/template/xmlconnect/form/element/themes.phtml
index a68b4f61c1..343942e060 100644
--- a/app/design/adminhtml/default/default/template/xmlconnect/form/element/themes.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/form/element/themes.phtml
@@ -24,42 +24,44 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-
 <?php
-/**
- * @var Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Design_Themes
- */
+/** @var $this Mage_XmlConnect_Block_Adminhtml_Mobile_Edit_Tab_Design_Themes */
 
-/**
- * @var Mage_XmlConnect_Helper_Theme
- */
-$_themesHelper  = Mage::helper('xmlconnect/theme');
-/**
- * @var Mage_XmlConnect_Helper_Data
- */
+/** @var $_themesHelper Mage_XmlConnect_Helper_Theme */
+$_themesHelper = Mage::helper('xmlconnect/theme');
+
+/** @var $_imageHelper Mage_XmlConnect_Helper_Data */
 $_imageHelper    = Mage::helper('xmlconnect/image');
 ?>
-
 <script type="text/javascript">
 // <![CDATA[
+<?php
+    $themes     = $this->getThemes();
+    $themeId    = $_themesHelper->getThemeId();
+    $themeLabel = $_themesHelper->getThemeLabel($themes);
+?>
+var currentTheme = '<?php echo $themeId; ?>';
+var visibleTheme = currentTheme;
+
 if (!window.Magento) {
     var Magento = new Object();
 }
 Magento.Dropdowns = Class.create();
 Magento.Dropdowns.prototype = {
     initialize: function(selector) {
-        var self=this;
-        var global = document;
-        this.selector = selector;
+        var global      = document;
+        this.selector   = selector;
+
         $$('.'+this.selector).each(this.init.bind(this));
+
         Event.observe(global, 'click', this.hide_all.bind(this,0));
     },
 
     init: function(el) {
-        this.head = el.down('li.ddtitle');
-        this.content = el.down('li.ddlist');
-        this.list = el.down('ul').childElements();
-        this.input = $(el.id+'_value');
+        this.head       = el.down('li.ddtitle');
+        this.content    = el.down('li.ddlist');
+        this.list       = el.down('ul').childElements();
+        this.input      = $(el.id+'_value');
 
         this.init_items(this.list);
         Event.observe(this.head.down('a'), 'click', this.show.bind(this, this.content));
@@ -79,6 +81,11 @@ Magento.Dropdowns.prototype = {
 
     hide_all: function() {
         $$('.ddlist').each(function(item){
+            i = 0;
+            if (i == 0 && item.style.display !== 'none') {
+                selectActiveTheme();
+                i++;
+            }
             item.style.display = 'none';
         });
     },
@@ -102,26 +109,8 @@ Magento.Dropdowns.prototype = {
             Effect.toggle(c, 'blind', { delay: 0.1, duration: .1 });
             c.addClassName('on');
         }
-        //this.hide(c);
     }
 };
-<?php
-        $themes = $this->getThemes();
-        $themeLabel = '';
-        $themeId = $this->getApplication()->getData('conf/extra/theme');
-        if (empty($themeId)) {
-            $themeId = $_themesHelper->getDefaultThemeName();
-        }
-        if (!empty($themeId)) {
-            foreach ($themes as $theme) {
-                if ($theme->getName() == $themeId) {
-                    $themeLabel = $this->__($theme->getLabel());
-                }
-            }
-        }
-?>
-currentTheme = '<?php echo $themeId; ?>';
-visibleTheme = currentTheme;
 
 /**
  * Color field onChange listener
@@ -135,9 +124,12 @@ function changeColorListener(id) {
         $(id).value = '_';
     }
     $(id).color.exportColor();
-
     $('box_' + id).style.background = $(id).value;
-    setThemeSelector('<?php echo $_themesHelper->getCustomThemeName(); ?>');
+}
+
+function selectActiveTheme() {
+    currentTheme = visibleTheme;
+    mmSetTheme(currentTheme);
 }
 
 isNewApplication = <?php echo ($this->isNewApplication() ? "true" : "false"); ?>;
@@ -146,23 +138,6 @@ tabDesignWasClicked = false;
 
 Event.observe(document, 'dom:loaded', function() {
     new Magento.Dropdowns('dropdown');
-<?php
-/*
-    $('submit_theme').observe('click', function() {
-        if (currentTheme) {
-            setThemeSelector(currentTheme);
-        }
-        saveThemeChanges();
-    });
-    $('reset_theme').observe('click', function() {
-        resetThemeChanges();
-    });
-*/
-?>
-    $('apply_theme').observe('click', function() {
-        currentTheme = visibleTheme;
-        mmSetTheme(currentTheme);
-    });
 
     $("mobile_app_tabs_design_section").observe('click', function() {
         if (isNewApplication && !isDefaultThemeLoaded && !tabDesignWasClicked) {
@@ -171,19 +146,23 @@ Event.observe(document, 'dom:loaded', function() {
             tabDesignWasClicked = true;
         }
     });
-
 });
 
+function saveTheme() {
+    if (currentTheme) {
+        setThemeSelector(currentTheme);
+    }
+    saveThemeChanges();
+}
+
 function createInputHiddenElementThemeLoaded() {
     inputElement = document.createElement('input');
     inputElement.type = "hidden";
     inputElement.name = "default_theme_loaded";
     inputElement.value = "1";
     $('theme_selector_id_value').parentNode.appendChild(inputElement);
-
 }
 mmColorUpdate = false;
-
 mmColorThemes = <?php echo Mage::helper('core')->jsonEncode($this->getAllThemes()); ?>;
 
 function setThemeSelector(theme) {
@@ -199,29 +178,29 @@ function mmSetTheme(theme) {
         for (var key in mmColorThemes[theme]) {
             color2set = mmColorThemes[theme][key];
             $(key).color.fromString(color2set);
-            $('box_'+key).style.background = color2set;
+            $('box_' + key).style.background = color2set;
         }
         mmColorUpdate = false;
     }
 }
 
 function toggleBlock(block,link){
-    $$('.'+block+'_cl').each(function(b) {
-        if(b.style.display=='none') {
-            b.style.display='table-row';
+    $$('.' + block + '_cl').each(function(b) {
+        if(b.style.display == 'none') {
+            b.style.display = 'table-row';
             link.style.backgroundPosition = '0 4px';
         } else {
-            b.style.display='none';
+            b.style.display = 'none';
             link.style.backgroundPosition = '0 -86px';
         }
     });
 }
-<?php
-/*
+
 function resetThemeChanges() {
     var actionUrl = '<?php echo $this->getResetThemeActionUrl() ?>';
+    currentTheme = visibleTheme;
     new Ajax.Request(actionUrl, {
-        parameters: {reset : 1},
+        parameters: {reset : 1, theme: visibleTheme},
         onSuccess: function(transport) {
             try {
                 response = transport.responseText;
@@ -233,7 +212,7 @@ function resetThemeChanges() {
                      } else {
                          mmColorThemes = responseJSON;
                          mmSetTheme(currentTheme);
-                         message = '<?php echo $this->__('Reset Successful');?>';
+                         message = '<?php echo $this->__('Theme configurations are successfully reset.');?>';
                      }
                 } else {
                     message = '<?php echo $this->__('Unknown Error'); ?>';
@@ -247,12 +226,14 @@ function resetThemeChanges() {
 }
 
 function saveThemeChanges() {
-    var actionUrl = "<?php echo $this->getSaveThemeActionUrl() ?>" + 'saveTheme/' + $('theme_selector_id_value').value;
+    var actionUrl = "<?php echo $this->getSaveThemeActionUrl() ?>" + 'saveTheme/' + visibleTheme;
+    <?php
+        $count = count($_themesHelper->getThemeAjaxParameters());
+    ?>
     var params = {
-        <?php $firstRow = true; ?>
-        <?php foreach ($_themesHelper->getThemeAjaxParameters() as $name => $id) : ?>
-            <?php echo ($firstRow === true ? $firstRow = '' : ',') . $name; ?> : $('<?php echo $id; ?>').value
-        <?php endforeach; ?>
+<?php foreach ($_themesHelper->getThemeAjaxParameters() as $name => $id) : ?>
+    <?php $count = --$count; echo $name ?> : $('<?php echo $id; ?>').value<?php echo $count ? ',' : ''; ?>
+<?php endforeach; ?>
         };
     new Ajax.Request(actionUrl, {
         parameters: params,
@@ -266,7 +247,7 @@ function saveThemeChanges() {
                         message = responseJSON.message;
                      } else {
                          mmColorThemes = responseJSON;
-                         message = '<?php echo $this->__('Theme has been saved.');?>';
+                         message = '<?php echo $this->__('Changes have been saved to theme.');?>';
                      }
                 } else {
                     message = '<?php echo $this->__('Unknown Error.'); ?>';
@@ -278,30 +259,33 @@ function saveThemeChanges() {
         }.bind(this)
     });
 }
-*/
-?>
 // ]]>
 </script>
 <tr><td colspan="2"  style="width:540px">
 <br />
-
 <label for="theme_selector_id" class="f-left theme-selector-title"><?php echo $this->__('Preset Theme'); ?></label>
 <div class="theme-select-cont">
     <input type="hidden" name="conf[extra][theme]" id="theme_selector_id_value" value="<?php echo $themeId; ?>"/>
     <input type="hidden" name="current_theme" id="theme_selector_id_value_flat" value="<?php echo $themeId; ?>"/>
     <ul class="dropdown theme_selector" id="theme_selector_id">
-        <li class="ddtitle theme_selector "><a href="#"><?php echo $themeLabel ? $this->__($themeLabel) : $this->__('Custom Colors');?><span>
-            <img src="<?php echo $_imageHelper->getSkinImagesUrl('swatch_'.$themeId.'.gif'); ?>"/></span></a></li>
+        <li class="ddtitle theme_selector"><a href="#"><?php echo $themeLabel ? $themeLabel : $this->__('Custom Colors');?><span>
+            <img src="<?php echo $_imageHelper->getSkinImagesUrl('swatch_' . $themeId . '.gif'); ?>"/></span></a></li>
         <li style="display:none;" class="ddlist">
             <ul>
             <?php foreach ($this->getThemes() as $theme): ?>
-                <li><a href="#" rel="<?php echo $theme->getName(); ?>"><?php echo $this->__($theme->getLabel()); ?> <span><img src="<?php echo $_imageHelper->getSkinImagesUrl('swatch_'.$theme->getName().'.gif'); ?>"/></span></a></li>
+                <li>
+                    <a href="#" rel="<?php echo $theme->getName(); ?>"><?php echo $theme->getLabel(); ?>
+                        <span><img src="<?php echo $_imageHelper->getSkinImagesUrl('swatch_' . $theme->getName() . '.gif'); ?>"/></span>
+                    </a>
+                </li>
             <?php endforeach; ?>
             </ul>
         </li>
     </ul>
     <div class="form-buttons" style="float:right">
-        <button type="button" class="scalable" style="margin: 0 2em 0 0" id="apply_theme"><span><?php echo $this->__('Apply Theme'); ?></span></button>
+        <button type="button" class="scalable" style="margin: 0 2em 0 0" id="save_theme" onclick="saveTheme();">
+            <span><?php echo $this->__('Save Theme'); ?></span>
+        </button>
     </div>
     <br/><br/>
 </div>
@@ -309,13 +293,14 @@ function saveThemeChanges() {
 </td></tr>
 
 <?php
-
 $colorFieldset = $this->getColorFieldset();
 $id2observe = array();
 ?>
 <?php foreach ($colorFieldset as $set) : ?>
 <tr><td colspan="2">
-<a href="javascript:void(0);" onclick="toggleBlock('<?php echo $set['id']; ?>', this);" class="a_color_block" style="display:block;"><strong><?php echo $set['label']; ?></strong></a>
+<a href="javascript:void(0);" onclick="toggleBlock('<?php echo $set['id']; ?>', this);" class="a_color_block" style="display:block;">
+    <strong><?php echo $set['label']; ?></strong>
+</a>
 </td></tr>
 <?php foreach ($set['fields'] as $field) : ?>
 
@@ -338,20 +323,23 @@ $id2observe = array();
 Event.observe(document, 'dom:loaded', function() {
 
 <?php foreach ($id2observe as $id) : ?>
-$('<?php echo $id; ?>').observe('change', function() { changeColorListener('<?php echo $id; ?>');});
+    $('<?php echo $id; ?>').observe('change', function() {
+        changeColorListener('<?php echo $id; ?>');
+    });
 <?php endforeach; ?>
 });
 //]]>
 </script>
-<?php
-/*<tr><td colspan="2">
-<div class="form-buttons">
 
-<!-- submitAndReloadArea($('order_history_block').parentNode, 'http://mage.local/index.php/admin/sales_order/addComment/order_id/2/') -->
-<button type="button" class="scalable back" style="margin: 0 2em 0 0" id="reset_theme"><span><?php echo $this->__('Reset'); ?></span></button>
-<button type="button" class="scalable" style="margin: 0 2em 0 0" id="submit_theme"><span><?php echo $this->__('Save Theme'); ?></span></button>
-<button type="button" class="scalable" style="margin: 0 2em 0 0" id="apply_theme"><span><?php echo $this->__('Apply Theme'); ?></span></button>
-</div>
-<br />
-*/?>
-</td></tr>
+<tr>
+    <td colspan="2">
+    <div class="form-buttons">
+        <button type="button" class="scalable back" style="margin: 0 2em 0 0" id="reset_theme" onclick="resetThemeChanges();">
+            <span><?php echo $this->__('Reset theme to default'); ?></span>
+        </button>
+    </div>
+    <br />
+    </td>
+<tr>
+</td>
+</tr>
diff --git a/app/design/adminhtml/default/default/template/xmlconnect/template/preview.phtml b/app/design/adminhtml/default/default/template/xmlconnect/template/preview.phtml
index e14a5a4e06..8bef37c764 100755
--- a/app/design/adminhtml/default/default/template/xmlconnect/template/preview.phtml
+++ b/app/design/adminhtml/default/default/template/xmlconnect/template/preview.phtml
@@ -27,8 +27,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html lang="en">
 <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title><?php echo $this->__('AirMail Template Preview'); ?></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />    
 </head>
 <body>
     <?php echo $this->getChildHtml('content') ?>
diff --git a/app/design/frontend/base/default/layout/paypal.xml b/app/design/frontend/base/default/layout/paypal.xml
index 7f6ee2047d..0351c7f4dd 100644
--- a/app/design/frontend/base/default/layout/paypal.xml
+++ b/app/design/frontend/base/default/layout/paypal.xml
@@ -62,6 +62,7 @@
         <reference name="head">
             <action method="addItem"><type>skin_js</type><name>js/checkout/review.js</name></action>
         </reference>
+        <block type="core/text_list" name="additional.product.info" />
     </paypal_express_review>
 
     <paypal_express_review_details>
diff --git a/app/design/frontend/base/default/layout/sales.xml b/app/design/frontend/base/default/layout/sales.xml
index 3c98682874..3234f68f71 100644
--- a/app/design/frontend/base/default/layout/sales.xml
+++ b/app/design/frontend/base/default/layout/sales.xml
@@ -134,6 +134,7 @@ Customer account home dashboard layout
             <action method="addLink" translate="label" module="sales"><name>shipment</name><path>*/*/shipment</path><label>Shipments</label></action>
             <action method="addLink" translate="label" module="sales"><name>creditmemo</name><path>*/*/creditmemo</path><label>Refunds</label></action>
         </reference>
+        <block type="core/text_list" name="additional.product.info" />
     </sales_order_invoice>
 
     <sales_order_shipment translate="label">
@@ -154,6 +155,7 @@ Customer account home dashboard layout
             <action method="addLink" translate="label" module="sales"><name>shipment</name><path></path><label>Shipments</label></action>
             <action method="addLink" translate="label" module="sales"><name>creditmemo</name><path>*/*/creditmemo</path><label>Refunds</label></action>
         </reference>
+        <block type="core/text_list" name="additional.product.info" />
     </sales_order_shipment>
 
     <sales_order_creditmemo translate="label">
@@ -180,6 +182,7 @@ Customer account home dashboard layout
             <action method="addLink" translate="label" module="sales"><name>shipment</name><path>*/*/shipment</path><label>Shipments</label></action>
             <action method="addLink" translate="label" module="sales"><name>creditmemo</name><path></path><label>Refunds</label></action>
         </reference>
+        <block type="core/text_list" name="additional.product.info" />
     </sales_order_creditmemo>
 
     <sales_order_reorder>
@@ -204,6 +207,7 @@ Customer account home dashboard layout
                 </block>
             </block>
         </reference>
+        <block type="core/text_list" name="additional.product.info" />
     </sales_order_print>
 
     <sales_order_printinvoice translate="label">
@@ -219,6 +223,7 @@ Customer account home dashboard layout
                 </block>
             </block>
         </reference>
+        <block type="core/text_list" name="additional.product.info" />
     </sales_order_printinvoice>
 
     <sales_order_printshipment translate="label">
@@ -228,6 +233,7 @@ Customer account home dashboard layout
                 <action method="addItemRender"><type>default</type><block>sales/order_item_renderer_default</block><template>sales/order/shipment/items/renderer/default.phtml</template></action>
             </block>
         </reference>
+        <block type="core/text_list" name="additional.product.info" />
     </sales_order_printshipment>
 
     <sales_order_printcreditmemo>
@@ -242,6 +248,7 @@ Customer account home dashboard layout
                 </block>
             </block>
         </reference>
+        <block type="core/text_list" name="additional.product.info" />
     </sales_order_printcreditmemo>
 
 <!--
@@ -259,6 +266,7 @@ Email layouts section
                 </block>
             </block>
         </block>
+        <block type="core/text_list" name="additional.product.info" />
     </sales_email_order_items>
 
     <sales_email_order_invoice_items>
@@ -271,12 +279,14 @@ Email layouts section
                 <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml"/>
             </block>
         </block>
+        <block type="core/text_list" name="additional.product.info" />
     </sales_email_order_invoice_items>
 
     <sales_email_order_shipment_items>
         <block type="sales/order_email_shipment_items" name="items" template="email/order/shipment/items.phtml">
             <action method="addItemRender"><type>default</type><block>sales/order_email_items_default</block><template>email/order/items/shipment/default.phtml</template></action>
         </block>
+        <block type="core/text_list" name="additional.product.info" />
     </sales_email_order_shipment_items>
 
     <sales_email_order_creditmemo_items>
@@ -289,5 +299,6 @@ Email layouts section
                 <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml"/>
             </block>
         </block>
+        <block type="core/text_list" name="additional.product.info" />
     </sales_email_order_creditmemo_items>
 </layout>
diff --git a/app/design/frontend/base/default/layout/xmlconnect.xml b/app/design/frontend/base/default/layout/xmlconnect.xml
index bb03271f81..531e8d2fb7 100644
--- a/app/design/frontend/base/default/layout/xmlconnect.xml
+++ b/app/design/frontend/base/default/layout/xmlconnect.xml
@@ -46,6 +46,7 @@
             <block type="xmlconnect/catalog_product_list" name="xmlconnect.catalog.product.list" as="product_list" output="">
                 <block type="xmlconnect/catalog_product_price" name="xmlconnect.catalog.product.price" as="product_price" output="">
                     <action method="addRenderer"><type>bundle</type><renderer>xmlconnect/catalog_product_price_bundle</renderer></action>
+                    <action method="addRenderer"><type>giftcard</type><renderer>xmlconnect/catalog_product_price_giftcard</renderer></action>
                 </block>
             </block>
 
@@ -61,6 +62,7 @@
 
             <block type="xmlconnect/catalog_product_price" name="xmlconnect.catalog.product.price" as="product_price" output="">
                 <action method="addRenderer"><type>bundle</type><renderer>xmlconnect/catalog_product_price_bundle</renderer></action>
+                <action method="addRenderer"><type>giftcard</type><renderer>xmlconnect/catalog_product_price_giftcard</renderer></action>
             </block>
 
             <block type="xmlconnect/catalog_product_attributes" name="xmlconnect.catalog.product.attributes" as="additional_info" output="" />
@@ -71,6 +73,7 @@
                 <action method="addRenderer"><type>configurable</type><renderer>xmlconnect/catalog_product_options_configurable</renderer></action>
                 <action method="addRenderer"><type>bundle</type><renderer>xmlconnect/catalog_product_options_bundle</renderer></action>
                 <action method="addRenderer"><type>grouped</type><renderer>xmlconnect/catalog_product_options_grouped</renderer></action>
+                <action method="addRenderer"><type>giftcard</type><renderer>xmlconnect/catalog_product_options_giftcard</renderer></action>
             </block>
         </block>
     </xmlconnect_catalog_product>
@@ -82,6 +85,7 @@
             <action method="addRenderer"><type>configurable</type><renderer>xmlconnect/catalog_product_options_configurable</renderer></action>
             <action method="addRenderer"><type>bundle</type><renderer>xmlconnect/catalog_product_options_bundle</renderer></action>
             <action method="addRenderer"><type>grouped</type><renderer>xmlconnect/catalog_product_options_grouped</renderer></action>
+            <action method="addRenderer"><type>giftcard</type><renderer>xmlconnect/catalog_product_options_giftcard</renderer></action>
         </block>
     </xmlconnect_catalog_productoptions>
 
@@ -104,6 +108,7 @@
             <block type="xmlconnect/catalog_product_list" name="xmlconnect.catalog.product.list" as="product_list" output="">
                 <block type="xmlconnect/catalog_product_price" name="xmlconnect.catalog.product.price" as="product_price" output="">
                     <action method="addRenderer"><type>bundle</type><renderer>xmlconnect/catalog_product_price_bundle</renderer></action>
+                    <action method="addRenderer"><type>giftcard</type><renderer>xmlconnect/catalog_product_price_giftcard</renderer></action>
                 </block>
             </block>
         </block>
@@ -120,10 +125,12 @@
             <action method="addItemRender"><type>configurable</type><block>checkout/cart_item_renderer_configurable</block><template>checkout/cart/item/default.phtml</template></action>
             <action method="addItemRender"><type>bundle</type><block>bundle/checkout_cart_item_renderer</block><template>checkout/cart/item/default.phtml</template></action>
             <action method="addItemRender"><type>grouped</type><block>checkout/cart_item_renderer_grouped</block><template>checkout/cart/item/default.phtml</template></action>
+            <action method="addItemRender"><type>giftcard</type><block>enterprise_giftcard/checkout_cart_item_renderer</block><template>checkout/cart/item/default.phtml</template></action>
 
             <block type="xmlconnect/cart_crosssell" name="xmlconnect.cart.crosssell" as="crosssell">
                 <block type="xmlconnect/catalog_product_price" name="xmlconnect.catalog.product.price" as="product_price" output="">
                     <action method="addRenderer"><type>bundle</type><renderer>xmlconnect/catalog_product_price_bundle</renderer></action>
+                    <action method="addRenderer"><type>giftcard</type><renderer>giftcard/catalog_product_price_giftcard</renderer></action>
                 </block>
             </block>
         </block>
@@ -145,6 +152,7 @@
         <block type="xmlconnect/wishlist" name="xmlconnect.wishlist" output="toHtml">
             <block type="xmlconnect/catalog_product_price" name="xmlconnect.catalog.product.price" as="product_price" output="">
                 <action method="addRenderer"><type>bundle</type><renderer>xmlconnect/catalog_product_price_bundle</renderer></action>
+                <action method="addRenderer"><type>giftcard</type><renderer>xmlconnect/catalog_product_price_giftcard</renderer></action>
             </block>
         </block>
     </xmlconnect_wishlist_index>
@@ -221,6 +229,7 @@
                 <action method="addItemRender"><type>configurable</type><block>checkout/cart_item_renderer_configurable</block><template>checkout/onepage/review/item.phtml</template></action>
                 <action method="addItemRender"><type>bundle</type><block>bundle/checkout_cart_item_renderer</block><template>checkout/onepage/review/item.phtml</template></action>
                 <action method="addItemRender"><type>grouped</type><block>checkout/cart_item_renderer_grouped</block><template>checkout/onepage/review/item.phtml</template></action>
+                <action method="addItemRender"><type>giftcard</type><block>enterprise_giftcard/checkout_cart_item_renderer</block><template>checkout/onepage/review/item.phtml</template></action>
             </block>
 
             <block type="xmlconnect/cart_totals" name="xmlconnect.checkout.order.review.totals" as="totals"/>
@@ -244,4 +253,15 @@
         <block type="xmlconnect/cms_page" name="xmlconnect.cms.page" output="toHtml"/>
     </xmlconnect_cms_page>
 
+    <!-- Payment bridge -->
+
+    <xmlconnect_pbridge_result>
+        <block type="xmlconnect/checkout_pbridge_result" name="xmlconnect.checkout.pbridge.result" template="xmlconnect/pbridge/result.phtml" output="toHtml" />
+    </xmlconnect_pbridge_result>
+
+    <!-- Product review -->
+
+    <xmlconnect_review_form>
+        <block type="xmlconnect/review_form" name="xmlconnect.review.form" output="toHtml"/>
+    </xmlconnect_review_form>
 </layout>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/shipping_method/available.phtml b/app/design/frontend/base/default/template/checkout/onepage/shipping_method/available.phtml
index 5b22868b57..594101c732 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/shipping_method/available.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/shipping_method/available.phtml
@@ -27,14 +27,14 @@
 <?php if (!($_shippingRateGroups = $this->getShippingRates())): ?>
     <p><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></p>
 <?php else: ?>
-<dl class="sp-methods">
-    <?php $shippingMe = array(); ?>
+    <dl class="sp-methods">
+    <?php $shippingCodePrice = array(); ?>
     <?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates): ?>
         <dt><?php echo $this->getCarrierName($code) ?></dt>
         <dd>
             <ul>
             <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
-                <?php $shippingMe[] = "'".$_rate->getCode()."':".(float)$_rate->getPrice(); ?>
+                <?php $shippingCodePrice[] = "'".$_rate->getCode()."':".(float)$_rate->getPrice(); ?>
                 <li>
                    <?php if ($_rate->getErrorMessage()): ?>
                     <ul class="messages"><li class="error-msg"><ul><li><?php echo $_rate->getErrorMessage() ?></li></ul></li></ul>
@@ -42,15 +42,15 @@
                         <?php if ($_sole) : ?>
                         <span class="no-display"><input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>" checked="checked" /></span>
                         <?php else: ?>
-                        <input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> class="radio" onchange="return includingShipping('<?php echo $_rate->getCode();?>');"/>
+                        <input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> class="radio"/>
 
+                        <?php if ($_rate->getCode() === $this->getAddressShippingMethod()): ?>
                         <script type="text/javascript">
-                        //<![CDATA[
-                            <?php if ($_rate->getCode()===$this->getAddressShippingMethod()): ?>
+                            //<![CDATA[
                                 lastPrice = <?php echo (float)$_rate->getPrice(); ?>;
-                            <?php endif; ?>
-                        //]]>
+                            //]]>
                         </script>
+                        <?php endif; ?>
 
                         <?php endif; ?>
                         <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
@@ -67,30 +67,33 @@
             </ul>
         </dd>
     <?php endforeach; ?>
-</dl>
+    </dl>
 <script type="text/javascript">
 //<![CDATA[
-    <?php if (!empty($shippingMe)): ?>
-        var shippingMe = {<?php echo implode(',',$shippingMe); ?>};
+    <?php if (!empty($shippingCodePrice)): ?>
+        var shippingCodePrice = {<?php echo implode(',',$shippingCodePrice); ?>};
     <?php endif; ?>
 
-    function includingShipping(getShippingCode)
-    {
-        <?php if (!empty($shippingMe)): ?>
-            var newPrice = shippingMe[getShippingCode];
-            if (!lastPrice) {
-                lastPrice = newPrice;
-                quoteBaseGrandTotal += newPrice;
-            }
-            if (newPrice != lastPrice) {
-                quoteBaseGrandTotal += (newPrice-lastPrice);
-                lastPrice = newPrice;
-
+    $$('input[type="radio"][name="shipping_method"]').each(function(el){
+        Event.observe(el, 'click', function(){
+            if (el.checked == true) {
+                var getShippingCode = el.getValue();
+                <?php if (!empty($shippingCodePrice)): ?>
+                    var newPrice = shippingCodePrice[getShippingCode];
+                    if (!lastPrice) {
+                        lastPrice = newPrice;
+                        quoteBaseGrandTotal += newPrice;
+                    }
+                    if (newPrice != lastPrice) {
+                        quoteBaseGrandTotal += (newPrice-lastPrice);
+                        lastPrice = newPrice;
+                    }
+                <?php endif; ?>
+                checkQuoteBaseGrandTotal = quoteBaseGrandTotal;
+                return false;
             }
-        <?php endif; ?>
-        checkQuoteBaseGrandTotal = quoteBaseGrandTotal;
-        return false;
-    }
+       });
+    });
 //]]>
 </script>
 <?php endif; ?>
diff --git a/app/design/frontend/base/default/template/checkout/success.phtml b/app/design/frontend/base/default/template/checkout/success.phtml
index b1e2880053..875f9a047b 100644
--- a/app/design/frontend/base/default/template/checkout/success.phtml
+++ b/app/design/frontend/base/default/template/checkout/success.phtml
@@ -34,10 +34,10 @@
 <?php if ($this->getCanViewOrder()) :?>
     <p><?php echo $this->__('Your order # is: %s.', sprintf('<a href="%s">%s</a>', $this->escapeHtml($this->getViewOrderUrl()), $this->escapeHtml($this->getOrderId()))) ?></p>
 <?php  else :?>
-    <p><?php echo $this->__('Your order # is: %s.', $this->escapeHtml($this->getOrderId())) ?>.</p>
+    <p><?php echo $this->__('Your order # is: %s.', $this->escapeHtml($this->getOrderId())) ?></p>
 <?php endif;?>
     <p><?php echo $this->__('You will receive an order confirmation email with details of your order and a link to track its progress.') ?></p>
-<?php if ($this->getViewOrder() && $this->getCanPrintOrder()) :?>
+<?php if ($this->getCanViewOrder() && $this->getCanPrintOrder()) :?>
     <p>
         <?php echo $this->__('Click <a href="%s" onclick="this.target=\'_blank\'">here to print</a> a copy of your order confirmation.', $this->getPrintUrl()) ?>
         <?php echo $this->getChildHtml() ?>
diff --git a/app/design/frontend/base/default/template/customer/address/edit.phtml b/app/design/frontend/base/default/template/customer/address/edit.phtml
index 08b37cdbaa..c7da24a1ba 100644
--- a/app/design/frontend/base/default/template/customer/address/edit.phtml
+++ b/app/design/frontend/base/default/template/customer/address/edit.phtml
@@ -45,7 +45,7 @@
         <h2 class="legend"><?php echo $this->__('Contact Information') ?></h2>
         <ul class="form-list">
             <li class="fields">
-                <?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getCustomer())->toHtml() ?>
+                <?php echo $this->getNameBlockHtml() ?>
             </li>
             <li class="wide">
                 <label for="company"><?php echo $this->__('Company') ?></label>
diff --git a/app/design/frontend/base/default/template/downloadable/customer/products/list.phtml b/app/design/frontend/base/default/template/downloadable/customer/products/list.phtml
index fa661ec3dc..c0f34c4df2 100644
--- a/app/design/frontend/base/default/template/downloadable/customer/products/list.phtml
+++ b/app/design/frontend/base/default/template/downloadable/customer/products/list.phtml
@@ -58,7 +58,7 @@
                     <td><a href="<?php echo $this->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>" title="<?php echo Mage::helper('downloadable')->__('View Order') ?>"><?php echo $_item->getPurchased()->getOrderIncrementId() ?></a></td>
                     <td><span class="nobr"><?php echo $this->formatDate($_item->getPurchased()->getCreatedAt()) ?></span></td>
                     <td><?php echo $this->htmlEscape($_item->getPurchased()->getProductName()) ?> - <a href="<?php echo $this->getDownloadUrl($_item) ?>" title="<?php echo Mage::helper('downloadable')->__('Start Download') ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $_item->getLinkTitle() ?></a></td>
-                    <td><em><?php echo ucfirst($_item->getStatus()) ?></em></td>
+                    <td><em><?php echo Mage::helper('downloadable')->__(ucfirst($_item->getStatus())) ?></em></td>
                     <td><?php echo $this->getRemainingDownloads($_item) ?></td>
                 </tr>
             <?php endforeach; ?>
diff --git a/app/design/frontend/base/default/template/email/order/items/creditmemo/default.phtml b/app/design/frontend/base/default/template/email/order/items/creditmemo/default.phtml
index 4f8abf054d..c3f528ada5 100644
--- a/app/design/frontend/base/default/template/email/order/items/creditmemo/default.phtml
+++ b/app/design/frontend/base/default/template/email/order/items/creditmemo/default.phtml
@@ -37,6 +37,10 @@
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
+        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+        <?php if ($addInfoBlock) :?>
+            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+        <?php endif; ?>
         <?php echo $this->htmlEscape($_item->getDescription()) ?>
     </td>
     <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->htmlEscape($this->getSku($_item)) ?></td>
diff --git a/app/design/frontend/base/default/template/email/order/items/invoice/default.phtml b/app/design/frontend/base/default/template/email/order/items/invoice/default.phtml
index 4f8abf054d..c3f528ada5 100644
--- a/app/design/frontend/base/default/template/email/order/items/invoice/default.phtml
+++ b/app/design/frontend/base/default/template/email/order/items/invoice/default.phtml
@@ -37,6 +37,10 @@
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
+        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+        <?php if ($addInfoBlock) :?>
+            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+        <?php endif; ?>
         <?php echo $this->htmlEscape($_item->getDescription()) ?>
     </td>
     <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->htmlEscape($this->getSku($_item)) ?></td>
diff --git a/app/design/frontend/base/default/template/email/order/items/order/default.phtml b/app/design/frontend/base/default/template/email/order/items/order/default.phtml
index 3fb0073d23..8f830a031e 100644
--- a/app/design/frontend/base/default/template/email/order/items/order/default.phtml
+++ b/app/design/frontend/base/default/template/email/order/items/order/default.phtml
@@ -39,6 +39,10 @@
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
+        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+        <?php if ($addInfoBlock) :?>
+            <?php echo $addInfoBlock->setItem($_item)->toHtml(); ?>
+        <?php endif; ?>
         <?php echo $this->escapeHtml($_item->getDescription()) ?>
     </td>
     <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->htmlEscape($this->getSku($_item)) ?></td>
diff --git a/app/design/frontend/base/default/template/email/order/items/shipment/default.phtml b/app/design/frontend/base/default/template/email/order/items/shipment/default.phtml
index b2473c3a54..68cdcc1bcf 100644
--- a/app/design/frontend/base/default/template/email/order/items/shipment/default.phtml
+++ b/app/design/frontend/base/default/template/email/order/items/shipment/default.phtml
@@ -36,6 +36,10 @@
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
+        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+        <?php if ($addInfoBlock) :?>
+            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+        <?php endif; ?>
         <?php echo $this->htmlEscape($_item->getDescription()) ?>
     </td>
     <td align="left" valign="top" style="font-size:11px; padding:3px 9px;"><?php echo $this->htmlEscape($this->getSku($_item)) ?></td>
diff --git a/app/design/frontend/base/default/template/page/html/head.phtml b/app/design/frontend/base/default/template/page/html/head.phtml
index eee69efa94..3edabd1d31 100644
--- a/app/design/frontend/base/default/template/page/html/head.phtml
+++ b/app/design/frontend/base/default/template/page/html/head.phtml
@@ -24,8 +24,8 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<title><?php echo $this->getTitle() ?></title>
 <meta http-equiv="Content-Type" content="<?php echo $this->getContentType() ?>" />
+<title><?php echo $this->getTitle() ?></title>
 <meta name="description" content="<?php echo htmlspecialchars($this->getDescription()) ?>" />
 <meta name="keywords" content="<?php echo htmlspecialchars($this->getKeywords()) ?>" />
 <meta name="robots" content="<?php echo htmlspecialchars($this->getRobots()) ?>" />
diff --git a/app/design/frontend/base/default/template/paypal/hss/iframe.phtml b/app/design/frontend/base/default/template/paypal/hss/iframe.phtml
index f345a4e76e..e230f7e995 100644
--- a/app/design/frontend/base/default/template/paypal/hss/iframe.phtml
+++ b/app/design/frontend/base/default/template/paypal/hss/iframe.phtml
@@ -25,8 +25,10 @@
  */
 
 ?>
-<div style="text-align:center;display:none;" id="iframe-warning"><?php echo $this->__('Please do not refresh the page until you complete payment.') ?></div>
-<iframe id="payflow-link-iframe" style="display:none;background-color:transparent;height:610px;width:99%;" scrolling="no" frameborder="0" border="0" src="<?php echo $this->getFrameActionUrl() ?>"></iframe>
+<div id="iframe-warning" class="warning-message">
+    <?php echo $this->__('Please do not refresh the page until you complete payment.') ?>
+</div>
+<iframe id="payflow-link-iframe" style="display:none;" scrolling="no" frameborder="0" border="0" src="<?php echo $this->getFrameActionUrl() ?>" height="610" width="570"></iframe>
 <script type="text/javascript">
 //<![CDATA[
 var headers = $$('#' + checkout.accordion.container.readAttribute('id') + ' .section');
diff --git a/app/design/frontend/base/default/template/paypal/hss/js.phtml b/app/design/frontend/base/default/template/paypal/hss/js.phtml
index 1f1c265568..cd214b7f5b 100644
--- a/app/design/frontend/base/default/template/paypal/hss/js.phtml
+++ b/app/design/frontend/base/default/template/paypal/hss/js.phtml
@@ -28,7 +28,7 @@
  * @see Mage_Paypal_Block_Iframe
  */
 ?>
-<div class="authentication" id="checkout-paypaliframe-load"></div>
+<div id="checkout-paypaliframe-load" class="authentication"></div>
 <script type="text/javascript">
 //<![CDATA[
 Review.prototype.save = function() {
diff --git a/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml
index 3f87d8a66d..9a26310a2d 100644
--- a/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml
+++ b/app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml
@@ -50,6 +50,10 @@
         <?php endforeach; ?>
         </dl>
         <?php endif; ?>
+        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+        <?php if ($addInfoBlock) :?>
+            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+        <?php endif; ?>
         <?php echo $this->htmlEscape($_item->getDescription()) ?>
         <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
             <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
diff --git a/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml
index e90dad8137..afee6f9c86 100644
--- a/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml
+++ b/app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml
@@ -51,6 +51,10 @@
         <?php endforeach; ?>
         </dl>
         <?php endif; ?>
+        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+        <?php if ($addInfoBlock) :?>
+            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+        <?php endif; ?>
         <?php echo $this->htmlEscape($_item->getDescription()) ?>
         <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
             <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
diff --git a/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml b/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml
index 3848e96b8f..f29b44c021 100644
--- a/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml
+++ b/app/design/frontend/base/default/template/sales/order/shipment/items/renderer/default.phtml
@@ -51,6 +51,10 @@
         <?php endforeach; ?>
         </dl>
         <?php endif; ?>
+        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+        <?php if ($addInfoBlock) :?>
+            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+        <?php endif; ?>
         <?php echo $this->htmlEscape($_item->getDescription()) ?>
         <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
             <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
diff --git a/app/design/frontend/base/default/template/wishlist/email/items.phtml b/app/design/frontend/base/default/template/wishlist/email/items.phtml
index 8accb4ab2d..d2c05256b7 100644
--- a/app/design/frontend/base/default/template/wishlist/email/items.phtml
+++ b/app/design/frontend/base/default/template/wishlist/email/items.phtml
@@ -31,7 +31,7 @@
     <tr>
     <?php $i = 0; foreach ($this->getWishlistItems() as $item): $i++ ?>
         <td width="32%">
-            <p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($item) ?>"><img src="<?php echo $this->helper('catalog/image')->init($item, 'small_image')->resize(135); ?>" style="border:1px solid #ccc;" width="135" height="135" alt="" /></a></p>
+            <p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($item) ?>"><img src="<?php echo $this->helper('catalog/image')->init($item->getProduct(), 'small_image')->resize(135); ?>" style="border:1px solid #ccc;" width="135" height="135" alt="" /></a></p>
             <p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($item) ?>" style="color:#203548;"><strong><?php echo $this->htmlEscape($item->getName()) ?></strong></a></p>
             <?php if($this->hasDescription($item)): ?><p align="center" style="font-size:12px;"><?php echo $this->__('Comment') ?>:<br /><?php echo $this->getEscapedDescription($item) ?></p><?php endif; ?>
             <p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($item) ?>" style="color:#1E7EC8;"><?php echo $this->__('View Product') ?></a> <small>
diff --git a/app/design/frontend/base/default/template/wishlist/shared.phtml b/app/design/frontend/base/default/template/wishlist/shared.phtml
index 2724c7e617..3b8ef6782d 100644
--- a/app/design/frontend/base/default/template/wishlist/shared.phtml
+++ b/app/design/frontend/base/default/template/wishlist/shared.phtml
@@ -45,31 +45,39 @@
                 </tr>
             </thead>
             <tbody>
-                <?php foreach($this->getWishlistItems() as $item): ?>
+            <?php foreach($this->getWishlistItems() as $item): ?>
+                <?php
+                    $product = $item->getProduct();
+                    $isVisibleProduct = $product->isVisibleInSiteVisibility();
+                ?>
                 <tr>
                     <td>
-                        <a href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->htmlEscape($item->getName()) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($item, 'small_image')->resize(113); ?>" width="113" height="113" alt="<?php echo $this->htmlEscape($item->getName()) ?>" /></a>
-                        <h3 class="product-name"><a href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->htmlEscape($item->getName()) ?>"><?php echo $this->htmlEscape($item->getName()) ?></a></h3>
-                        <?php echo $this->getPriceHtml($item) ?>
+                        <a class="product-image" href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->htmlEscape($product->getName()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($product, 'small_image')->resize(113, 113); ?>" width="113" height="113" alt="<?php echo $this->htmlEscape($product->getName()) ?>" /></a>
+                        <h2 class="product-name"><a href="<?php echo $this->getProductUrl($item) ?>"><?php echo $this->htmlEscape($product->getName()) ?></a></h2>
+                        <?php echo $this->getPriceHtml($product) ?>
+                        <?php echo $this->getDetailsHtml($item) ?>
                     </td>
                     <td><?php echo $this->getEscapedDescription($item) ?></td>
                     <td class="a-center">
-                    <?php if ($item->isSaleable()): ?>
-                        <button type="button" title="<?php echo $this->__('Add to Cart') ?>" onclick="setLocation('<?php echo $this->getAddToCartUrl($item) ?>')" class="button btn-cart"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
-                    <?php endif;?>
+                    <?php if ($product->isSaleable()): ?>
+                        <?php if ($isVisibleProduct): ?>
+                            <button type="button" title="<?php echo $this->__('Add to Cart') ?>" onclick="setLocation('<?php echo $this->getSharedItemAddToCartUrl($item) ?>')" class="button btn-cart"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
+                        <?php endif ?>
+                    <?php endif; ?>
                         <p><a href="#" onclick="setLocation('<?php echo $this->getAddToWishlistUrl($item) ?>'); return false;" class="link-wishlist"><?php echo $this->__('Add to Wishlist') ?></a></p>
                     </td>
                 </tr>
-                <?php endforeach ?>
+            <?php endforeach ?>
             </tbody>
             </table>
             <script type="text/javascript">decorateTable('wishlist-table');</script>
         </fieldset>
-        <?php if ($this->isSaleable()):?>
         <div class="buttons-set">
-            <button type="button" title="<?php echo $this->__('Add All to Cart') ?>" onclick="setLocation('<?php echo $this->getUrl('*/*/allcart', array('_current'=>true)) ?>')" class="button"><span><span><?php echo $this->__('Add All to Cart') ?></span></span></button>
+            <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
+            <?php if($this->isSaleable()):?>
+                <button type="button" title="<?php echo $this->__('Add All to Cart') ?>" onclick="setLocation('<?php echo $this->getUrl('*/*/allcart', array('_current'=>true)) ?>')" class="button"><span><span><?php echo $this->__('Add All to Cart') ?></span></span></button>
+            <?php endif;?>
         </div>
-        <?php endif;?>
     </form>
     <?php else: ?>
         <p><?php echo $this->__('Wishlist is empty now.') ?></p>
diff --git a/app/design/frontend/base/default/template/xmlconnect/pbridge/result.phtml b/app/design/frontend/base/default/template/xmlconnect/pbridge/result.phtml
new file mode 100755
index 0000000000..8563faf93a
--- /dev/null
+++ b/app/design/frontend/base/default/template/xmlconnect/pbridge/result.phtml
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<script type="text/javascript">
+//<![CDATA[
+
+    function setPaymentMethod()
+    {
+        /**
+         * We can not access the document-object of the parent window
+         * because of security restrictions of the mobile device's browser.
+         * Therefore we perform redirect with given params that we will use for checkout.
+         */
+        window.parent.location.href = '<?php echo $this->getPbridgeParamsAsUrl(); ?>';
+    }
+    window.onload = setPaymentMethod();
+//]]>
+</script>
diff --git a/app/design/install/default/default/template/page.phtml b/app/design/install/default/default/template/page.phtml
index 9422e9d226..7c5649e537 100644
--- a/app/design/install/default/default/template/page.phtml
+++ b/app/design/install/default/default/template/page.phtml
@@ -32,8 +32,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-<title><?php echo Mage::helper('install')->__('Magento Installation Wizard') ?></title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title><?php echo Mage::helper('install')->__('Magento Installation Wizard') ?></title>
 
 <link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
 <link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
diff --git a/app/etc/modules/Mage_All.xml b/app/etc/modules/Mage_All.xml
index 61a4b0fc03..e659f18109 100644
--- a/app/etc/modules/Mage_All.xml
+++ b/app/etc/modules/Mage_All.xml
@@ -221,6 +221,7 @@
             <depends>
                 <Mage_Sales/>
                 <Mage_Payment/>
+                <Mage_Usa/>
             </depends>
         </Mage_GoogleCheckout>
         <Mage_Log>
diff --git a/app/locale/en_US/Mage_Adminhtml.csv b/app/locale/en_US/Mage_Adminhtml.csv
index 6a459c4dc3..173c7f8395 100644
--- a/app/locale/en_US/Mage_Adminhtml.csv
+++ b/app/locale/en_US/Mage_Adminhtml.csv
@@ -6,9 +6,10 @@
 "%s cache type(s) disabled.","%s cache type(s) disabled."
 "%s cache type(s) enabled.","%s cache type(s) enabled."
 "%s cache type(s) refreshed.","%s cache type(s) refreshed."
-"(Absolute path or Relative to Magento install root, ex. var/export)","(Absolute path or Relative to Magento install root, ex. var/export)"
+"(For Type ""Local Server"" need to use relative path to Magento install var/export or var/import, e.g. var/export, var/import, var/export/some/dir, var/import/some/dir)","(For Type ""Local Server"" need to use relative path to Magento install var/export or var/import, e.g. var/export, var/import, var/export/some/dir, var/import/some/dir)"
 "(For US 2-letter state names)","(For US 2-letter state names)"
 "(If left empty will be auto-generated)","(If left empty will be auto-generated)"
+"(Includes more countries than those listed below. As the application owner, you are responsible for complying with country-specific laws related to the distribution or sale of your application into that country, including your home country.)","(Includes more countries than those listed below. As the application owner, you are responsible for complying with country-specific laws related to the distribution or sale of your application into that country, including your home country.)"
 "(Leave empty for first spreadsheet)","(Leave empty for first spreadsheet)"
 "(Products will be added/updated to this store if 'store' column is blank or missing in the import file.)","(Products will be added/updated to this store if 'store' column is blank or missing in the import file.)"
 "(Shift-)Click or drag to change value","(Shift-)Click or drag to change value"
@@ -45,6 +46,7 @@
 "A user with the same user name or email aleady exists.","A user with the same user name or email aleady exists."
 "API Key","API Key"
 "API Key Confirmation","API Key Confirmation"
+"ASCII","ASCII"
 "Abandoned Carts","Abandoned Carts"
 "About the calendar","About the calendar"
 "Access Denied","Access Denied"
@@ -66,7 +68,6 @@
 "Add Exception","Add Exception"
 "Add Field Mapping","Add Field Mapping"
 "Add Field with URL:","Add Field with URL:"
-"Add More Templates","Add More Templates"
 "Add New Image","Add New Image"
 "Add New Profile","Add New Profile"
 "Add New Role","Add New Role"
@@ -100,6 +101,7 @@
 "All Websites","All Websites"
 "All countries","All countries"
 "All fields","All fields"
+"All locations","All locations"
 "All possible rates were fetched, please click on ""Save"" to apply","All possible rates were fetched, please click on ""Save"" to apply"
 "All rates were fetched, please click on ""Save"" to apply","All rates were fetched, please click on ""Save"" to apply"
 "All valid rates have been saved.","All valid rates have been saved."
@@ -135,7 +137,6 @@
 "Any Store","Any Store"
 "Any Type","Any Type"
 "Any Visibility","Any Visibility"
-"Apply Theme","Apply Theme"
 "Archive file name:","Archive file name:"
 "Are you sure that you want to delete this template?","Are you sure that you want to delete this template?"
 "Are you sure that you want to strip tags?","Are you sure that you want to strip tags?"
@@ -151,6 +152,7 @@
 "Available Products","Available Products"
 "Average Order Amount","Average Order Amount"
 "Average Orders","Average Orders"
+"BINARY","BINARY"
 "Back","Back"
 "Back to Login","Back to Login"
 "Backup","Backup"
@@ -207,6 +209,7 @@
 "Category:","Category:"
 "Chairs","Chairs"
 "Change Orientation","Change Orientation"
+"Changes have been saved to theme.","Changes have been saved to theme."
 "Channel","Channel"
 "Chart is disabled. If you want to enable chart, click <a href=""%s"">here</a>.","Chart is disabled. If you want to enable chart, click <a href=""%s"">here</a>."
 "Checkbox","Checkbox"
@@ -304,6 +307,7 @@
 "Delete User","Delete User"
 "Delete Website","Delete Website"
 "Description","Description"
+"Deselect All","Deselect All"
 "Design","Design"
 "Design Section","Design Section"
 "Details","Details"
@@ -348,6 +352,7 @@
 "Entity Attributes","Entity Attributes"
 "Entity Type","Entity Type"
 "Entity type:","Entity type:"
+"Error","Error"
 "Excel XML","Excel XML"
 "Excl. Tax","Excl. Tax"
 "Expiration Date","Expiration Date"
@@ -372,6 +377,7 @@
 "File","File"
 "File Information","File Information"
 "File System","File System"
+"File mode","File mode"
 "File name:","File name:"
 "File size should be more than 0 bytes","File size should be more than 0 bytes"
 "Files","Files"
@@ -413,6 +419,7 @@
 "HTTP (unsecure)","HTTP (unsecure)"
 "HTTPS (SSL)","HTTPS (SSL)"
 "Help Us Keep Magento Healthy - Report All Bugs","Help Us Keep Magento Healthy - Report All Bugs"
+"Helper attributes should not be used in custom layout updates.","Helper attributes should not be used in custom layout updates."
 "Helper for options rendering doesn't implement required interface.","Helper for options rendering doesn't implement required interface."
 "Home","Home"
 "ID","ID"
@@ -460,6 +467,7 @@
 "Invalid parent block for this block","Invalid parent block for this block"
 "Invalid parent block for this block.","Invalid parent block for this block."
 "Invalid sender name ""%s"". Please use only visible characters and spaces.","Invalid sender name ""%s"". Please use only visible characters and spaces."
+"Invalid timezone","Invalid timezone"
 "Invalidated","Invalidated"
 "Inventory Stock Status","Inventory Stock Status"
 "Invoice #%s comment added","Invoice #%s comment added"
@@ -501,6 +509,7 @@
 "List Only","List Only"
 "Load Template","Load Template"
 "Load default template","Load default template"
+"Loading Preview...","Loading Preview..."
 "Loading...","Loading..."
 "Local Server","Local Server"
 "Local/Remote Server","Local/Remote Server"
@@ -638,6 +647,7 @@
 "Optional","Optional"
 "Options","Options"
 "Options menu items","Options menu items"
+"Order","Order"
 "Order #%s","Order #%s"
 "Order #%s (%s)","Order #%s (%s)"
 "Order Created Date","Order Created Date"
@@ -804,7 +814,7 @@
 "Required settings","Required settings"
 "Reset","Reset"
 "Reset Filter","Reset Filter"
-"Reset Successful","Reset Successful"
+"Reset theme to default","Reset theme to default"
 "Resize","Resize"
 "Resource Access","Resource Access"
 "Resources","Resources"
@@ -860,7 +870,6 @@
 "Select Category","Select Category"
 "Select Date","Select Date"
 "Select Range","Select Range"
-"Select Template","Select Template"
 "Select Visible","Select Visible"
 "Select date","Select date"
 "Selected allowed currency ""%s"" is not available in installed currencies.","Selected allowed currency ""%s"" is not available in installed currencies."
@@ -1009,6 +1018,7 @@
 "The profile has been saved.","The profile has been saved."
 "The profile has been updated.","The profile has been updated."
 "The profile has no changes.","The profile has no changes."
+"The profile you are trying to save no longer exists","The profile you are trying to save no longer exists"
 "The rating has been deleted.","The rating has been deleted."
 "The rating has been saved.","The rating has been saved."
 "The role has been deleted.","The role has been deleted."
@@ -1021,7 +1031,7 @@
 "The tag has been saved.","The tag has been saved."
 "The user has been deleted.","The user has been deleted."
 "The user has been saved.","The user has been saved."
-"Theme has been saved.","Theme has been saved."
+"Theme configurations are successfully reset.","Theme configurations are successfully reset."
 "Themes JavaScript and CSS files combined to one file.","Themes JavaScript and CSS files combined to one file."
 "There has been wrong payment information submitted or time limit has expired. Please, try again.","There has been wrong payment information submitted or time limit has expired. Please, try again."
 "There is an error in one of the option rows.","There is an error in one of the option rows."
@@ -1172,6 +1182,8 @@
 "Wrong tag was specified.","Wrong tag was specified."
 "Wrong transaction ID specified.","Wrong transaction ID specified."
 "XML","XML"
+"XML data is invalid.","XML data is invalid."
+"XML object is not instance of ""Varien_Simplexml_Element"".","XML object is not instance of ""Varien_Simplexml_Element""."
 "YTD","YTD"
 "Year","Year"
 "Yes","Yes"
diff --git a/app/locale/en_US/Mage_Api.csv b/app/locale/en_US/Mage_Api.csv
index ec06af6a7e..d79807793c 100644
--- a/app/locale/en_US/Mage_Api.csv
+++ b/app/locale/en_US/Mage_Api.csv
@@ -1,8 +1,9 @@
 " and "," and "
 " note that the URLs provided below are the correct values for your current website): "," note that the URLs provided below are the correct values for your current website): "
-"(Absolute path or Relative to Magento install root, ex. var/export)","(Absolute path or Relative to Magento install root, ex. var/export)"
+"(For Type ""Local Server"" need to use relative path to Magento install var/export or var/import, e.g. var/export, var/import, var/export/some/dir, var/import/some/dir)","(For Type ""Local Server"" need to use relative path to Magento install var/export or var/import, e.g. var/export, var/import, var/export/some/dir, var/import/some/dir)"
 "(For US 2-letter state names)","(For US 2-letter state names)"
 "(If left empty will be auto-generated)","(If left empty will be auto-generated)"
+"(Includes more countries than those listed below. As the application owner, you are responsible for complying with country-specific laws related to the distribution or sale of your application into that country, including your home country.)","(Includes more countries than those listed below. As the application owner, you are responsible for complying with country-specific laws related to the distribution or sale of your application into that country, including your home country.)"
 "(Leave empty for first spreadsheet)","(Leave empty for first spreadsheet)"
 "(Products will be added/updated to this store if 'store' column is blank or missing in the import file.)","(Products will be added/updated to this store if 'store' column is blank or missing in the import file.)"
 "(Shift-)Click or drag to change value","(Shift-)Click or drag to change value"
@@ -20,6 +21,7 @@
 "10:40 AM","10:40 AM"
 "80px x 80px","80px x 80px"
 "80x80 px","80x80 px"
+"ASCII","ASCII"
 "About the calendar","About the calendar"
 "Access denied.","Access denied."
 "Account Created in:","Account Created in:"
@@ -30,7 +32,6 @@
 "Activate","Activate"
 "Add Contents Path","Add Contents Path"
 "Add Field with URL:","Add Field with URL:"
-"Add More Templates","Add More Templates"
 "Add New Role","Add New Role"
 "Add New User","Add New User"
 "Add PHP Extension dependency","Add PHP Extension dependency"
@@ -42,7 +43,7 @@
 "All","All"
 "All Websites","All Websites"
 "All fields","All fields"
-"Apply Theme","Apply Theme"
+"All locations","All locations"
 "Archive file name:","Archive file name:"
 "Are you sure that you want to delete this template?","Are you sure that you want to delete this template?"
 "Are you sure that you want to strip tags?","Are you sure that you want to strip tags?"
@@ -51,6 +52,7 @@
 "Attributes","Attributes"
 "Authors","Authors"
 "Available Products","Available Products"
+"BINARY","BINARY"
 "Back","Back"
 "Big Image","Big Image"
 "Billing Address","Billing Address"
@@ -64,6 +66,7 @@
 "Catalog","Catalog"
 "Chairs","Chairs"
 "Change Orientation","Change Orientation"
+"Changes have been saved to theme.","Changes have been saved to theme."
 "Channel","Channel"
 "Child Transactions","Child Transactions"
 "Choose Store View","Choose Store View"
@@ -104,6 +107,7 @@
 "Default Response Charset","Default Response Charset"
 "Default Values","Default Values"
 "Delete","Delete"
+"Deselect All","Deselect All"
 "Direction:","Direction:"
 "Display %s first","Display %s first"
 "Distributed under GNU LGPL. See %s for details.","Distributed under GNU LGPL. See %s for details."
@@ -134,6 +138,7 @@
 "FTP Host[:Port]","FTP Host[:Port]"
 "Field Mapping","Field Mapping"
 "File Information","File Information"
+"File mode","File mode"
 "File name:","File name:"
 "Files","Files"
 "Final Price","Final Price"
@@ -185,6 +190,7 @@
 "Latest Message:","Latest Message:"
 "Leave empty to use tax identifier","Leave empty to use tax identifier"
 "Links with associated products will retain only after saving current product.","Links with associated products will retain only after saving current product."
+"Loading Preview...","Loading Preview..."
 "Loading...","Loading..."
 "Local Server","Local Server"
 "Local/Remote Server","Local/Remote Server"
@@ -192,8 +198,8 @@
 "Log Out","Log Out"
 "Logged in as %s","Logged in as %s"
 "MS Excel XML","MS Excel XML"
-"Magento Core Api","Magento Core Api"
-"Magento Core Api Section","Magento Core Api Section"
+"Magento Core API","Magento Core API"
+"Magento Core API Section","Magento Core API Section"
 "Magento Logo","Magento Logo"
 "Magento ver. %s","Magento ver. %s"
 "Magento&trade; is a trademark of Magento Inc.<br/>Copyright &copy; %s Magento Inc.","Magento&trade; is a trademark of Magento Inc.<br/>Copyright &copy; %s Magento Inc."
@@ -296,8 +302,7 @@
 "Remote FTP","Remote FTP"
 "Remove","Remove"
 "Required settings","Required settings"
-"Reset","Reset"
-"Reset Successful","Reset Successful"
+"Reset theme to default","Reset theme to default"
 "Resource Access","Resource Access"
 "Resources","Resources"
 "Return URL: ","Return URL: "
@@ -312,7 +317,6 @@
 "Select All","Select All"
 "Select Date","Select Date"
 "Select Range","Select Range"
-"Select Template","Select Template"
 "Select Visible","Select Visible"
 "Select date","Select date"
 "Shipment Comments","Shipment Comments"
@@ -348,10 +352,9 @@
 "T-Shirts","T-Shirts"
 "Target","Target"
 "Tell a Friend","Tell a Friend"
-"Template Name","Template Name"
 "The card has failed verification with the issuer bank.","The card has failed verification with the issuer bank."
 "The information in this tab has been changed.","The information in this tab has been changed."
-"Theme has been saved.","Theme has been saved."
+"Theme configurations are successfully reset.","Theme configurations are successfully reset."
 "There has been wrong payment information submitted or time limit has expired. Please, try again.","There has been wrong payment information submitted or time limit has expired. Please, try again."
 "This is a demo store. Any orders placed through this store will not be honored or fulfilled.","This is a demo store. Any orders placed through this store will not be honored or fulfilled."
 "This is a required field.","This is a required field."
@@ -398,6 +401,7 @@
 "View Gallery","View Gallery"
 "View Statistics For","View Statistics For"
 "Visibility:","Visibility:"
+"WS-I Compliance","WS-I Compliance"
 "Warning! Empty value can cause problems with CSV format.","Warning! Empty value can cause problems with CSV format."
 "Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?"
 "Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?"
diff --git a/app/locale/en_US/Mage_Catalog.csv b/app/locale/en_US/Mage_Catalog.csv
index 7a6e4e5f74..a096837ab9 100644
--- a/app/locale/en_US/Mage_Catalog.csv
+++ b/app/locale/en_US/Mage_Catalog.csv
@@ -52,7 +52,6 @@
 "An error occurred while removing products from websites.","An error occurred while removing products from websites."
 "An error occurred while saving the URL rewrite.","An error occurred while saving the URL rewrite."
 "An error occurred while saving the attribute set.","An error occurred while saving the attribute set."
-"An error occurred while saving the collection, aborting. Error message: %s","An error occurred while saving the collection, aborting. Error message: %s"
 "An error occurred while saving the product. ","An error occurred while saving the product. "
 "An error occurred while saving the search query.","An error occurred while saving the search query."
 "An error occurred while saving this group.","An error occurred while saving this group."
@@ -247,6 +246,7 @@
 "Exclude","Exclude"
 "Expand All","Expand All"
 "Failed","Failed"
+"Failed to copy file %s. Please, delete media with non-existing images and try again.","Failed to copy file %s. Please, delete media with non-existing images and try again."
 "Failed to move file: %s","Failed to move file: %s"
 "Feature Products","Feature Products"
 "Field is not complete","Field is not complete"
@@ -343,7 +343,6 @@
 "Maximal Depth","Maximal Depth"
 "Maximum Image Size","Maximum Image Size"
 "Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
-"Maximum allowed image size for '%s' is %sx%s px.","Maximum allowed image size for '%s' is %sx%s px."
 "Maximum image height","Maximum image height"
 "Maximum image width","Maximum image width"
 "Maximum number of characters:","Maximum number of characters:"
@@ -563,12 +562,8 @@
 "Simple Product","Simple Product"
 "Site Map","Site Map"
 "Sitemap","Sitemap"
-"Skip import row, is not valid value ""%s"" for field ""%s""","Skip import row, is not valid value ""%s"" for field ""%s"""
 "Skip import row, required field ""%s"" for the new customer is not defined.","Skip import row, required field ""%s"" for the new customer is not defined."
-"Skip import row, the value ""%s"" is invalid for field ""%s""","Skip import row, the value ""%s"" is invalid for field ""%s"""
-"Skipping import row, required field ""%s"" for new products is not defined.","Skipping import row, required field ""%s"" for new products is not defined."
 "Skipping import row, required field ""%s"" is not defined.","Skipping import row, required field ""%s"" is not defined."
-"Skipping import row, store ""%s"" field does not exist.","Skipping import row, store ""%s"" field does not exist."
 "Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","Skipping import row, the value ""%s"" is not valid for the ""%s"" field."
 "Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products."
 "Some of the products below do not have all the required options. Please edit them and configure all the required options.","Some of the products below do not have all the required options. Please edit them and configure all the required options."
@@ -603,8 +598,6 @@
 "The category has been saved.","The category has been saved."
 "The comparison list was cleared.","The comparison list was cleared."
 "The email template is not specified by administrator.","The email template is not specified by administrator."
-"The file '%s' for '%s' has an invalid extension","The file '%s' for '%s' has an invalid extension"
-"The file '%s' you uploaded is larger than %s Megabytes allowed by server","The file '%s' you uploaded is larger than %s Megabytes allowed by server"
 "The file you uploaded is larger than %s Megabytes allowed by server","The file you uploaded is larger than %s Megabytes allowed by server"
 "The filters must be an array.","The filters must be an array."
 "The image contents is not valid base64 data.","The image contents is not valid base64 data."
diff --git a/app/locale/en_US/Mage_Checkout.csv b/app/locale/en_US/Mage_Checkout.csv
index 2608f9810a..28cecee10d 100644
--- a/app/locale/en_US/Mage_Checkout.csv
+++ b/app/locale/en_US/Mage_Checkout.csv
@@ -4,6 +4,7 @@
 "Add New Address","Add New Address"
 "Add New Condition","Add New Condition"
 "Add coupon code for shopping cart","Add coupon code for shopping cart"
+"Add gift messages to shopping cart","Add gift messages to shopping cart"
 "Add product to shopping cart","Add product to shopping cart"
 "Add product(s) to shopping cart","Add product(s) to shopping cart"
 "Add to Cart","Add to Cart"
@@ -41,7 +42,7 @@
 "Cannot update shopping cart.","Cannot update shopping cart."
 "Cannot update the item.","Cannot update the item."
 "Card Verification Number Visual Reference","Card Verification Number Visual Reference"
-"Cart Product Api","Cart Product Api"
+"Cart Product API","Cart Product API"
 "Cart Subtotal:","Cart Subtotal:"
 "Change","Change"
 "Change Billing Address","Change Billing Address"
@@ -124,6 +125,7 @@
 "Get list of products in shopping cart","Get list of products in shopping cart"
 "Get terms and conditions","Get terms and conditions"
 "Get total prices for shopping cart","Get total prices for shopping cart"
+"Gift Message","Gift Message"
 "Grand Total:","Grand Total:"
 "Grouped Product Image","Grouped Product Image"
 "HTML","HTML"
@@ -165,9 +167,12 @@
 "One Page Checkout Failure","One Page Checkout Failure"
 "One Page Checkout Overview","One Page Checkout Overview"
 "One Page Checkout Success","One Page Checkout Success"
+"One item of products do not have identifier or sku","One item of products do not have identifier or sku"
+"One item of products is not belong any of quote item","One item of products is not belong any of quote item"
 "Order #","Order #"
 "Order Review","Order Review"
 "Order Success","Order Success"
+"Order place error.","Order place error."
 "Other Items in Your Order","Other Items in Your Order"
 "Overview Items After","Overview Items After"
 "Password","Password"
diff --git a/app/locale/en_US/Mage_Cms.csv b/app/locale/en_US/Mage_Cms.csv
index 008b2eed53..209fe6c36c 100644
--- a/app/locale/en_US/Mage_Cms.csv
+++ b/app/locale/en_US/Mage_Cms.csv
@@ -76,6 +76,7 @@
 "Layout Update XML","Layout Update XML"
 "Link to a CMS Page","Link to a CMS Page"
 "Manage Pages","Manage Pages"
+"Media Gallery","Media Gallery"
 "Media Storage","Media Storage"
 "Meta Data","Meta Data"
 "Meta Description","Meta Description"
diff --git a/app/locale/en_US/Mage_Core.csv b/app/locale/en_US/Mage_Core.csv
index 324469c31c..9532849366 100644
--- a/app/locale/en_US/Mage_Core.csv
+++ b/app/locale/en_US/Mage_Core.csv
@@ -11,7 +11,13 @@
 "Admin Base URL","Admin Base URL"
 "Admin User Emails","Admin User Emails"
 "Advanced","Advanced"
+"After selecting a new media storage location, press the Synchronize button
+                                to transfer all media to that location. Media will not be available in the new
+                                location until the synchronization process is complete.","After selecting a new media storage location, press the Synchronize button
+                                to transfer all media to that location. Media will not be available in the new
+                                location until the synchronization process is complete."
 "Allow Countries","Allow Countries"
+"Allow Symlinks","Allow Symlinks"
 "Allowed IPs (comma separated)","Allowed IPs (comma separated)"
 "Allowed file types: ICO, PNG, GIF, JPEG, APNG, SVG. Not all browsers support all these formats!","Allowed file types: ICO, PNG, GIF, JPEG, APNG, SVG. Not all browsers support all these formats!"
 "Allows customers to stay logged in when switching between different stores.","Allows customers to stay logged in when switching between different stores."
@@ -38,6 +44,7 @@
 "CSS Settings","CSS Settings"
 "Cache Storage Management","Cache Storage Management"
 "Cache storage may contain additional data. Are you sure that you want flush it?","Cache storage may contain additional data. Are you sure that you want flush it?"
+"Can not create invoice. Order was not found.","Can not create invoice. Order was not found."
 "Can't retrieve request object","Can't retrieve request object"
 "Cancel","Cancel"
 "Cannot complete this operation from non-admin area.","Cannot complete this operation from non-admin area."
@@ -101,6 +108,7 @@
 "Enabled","Enabled"
 "Enabled for Admin","Enabled for Admin"
 "Enabled for Frontend","Enabled for Frontend"
+"Environment Update Time","Environment Update Time"
 "Error in file: ""%s"" - %s","Error in file: ""%s"" - %s"
 "Error: Passwords do not match","Error: Passwords do not match"
 "Exceptions Log File Name","Exceptions Log File Name"
@@ -125,6 +133,7 @@
 "ID Path for Specified Store","ID Path for Specified Store"
 "If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","If the current frame position does not cover utmost pages, will render link to current position plus/minus this value."
 "Incorrect credit card expiration date.","Incorrect credit card expiration date."
+"Input type ""%value%"" not found in the input types list.","Input type ""%value%"" not found in the input types list."
 "Invalid base url type","Invalid base url type"
 "Invalid block name to set child %s: %s","Invalid block name to set child %s: %s"
 "Invalid block type: %s","Invalid block type: %s"
@@ -169,6 +178,9 @@
 "Pagination Frame","Pagination Frame"
 "Pagination Frame Skip","Pagination Frame Skip"
 "Parent directory does not exist: %s","Parent directory does not exist: %s"
+"Path ""%value%"" is not available and cannot be used.","Path ""%value%"" is not available and cannot be used."
+"Path ""%value%"" is protected and cannot be used.","Path ""%value%"" is protected and cannot be used."
+"Path ""%value%"" may not include parent directory traversal (""../"", ""..\\).""","Path ""%value%"" may not include parent directory traversal (""../"", ""..\\)."""
 "Please choose to register or to checkout as a guest","Please choose to register or to checkout as a guest"
 "Please define flag code.","Please define flag code."
 "Please enter 6 or more characters.","Please enter 6 or more characters."
@@ -184,6 +196,9 @@
 "Please enter a valid XML-identifier. For example something_1, block5, id-4.","Please enter a valid XML-identifier. For example something_1, block5, id-4."
 "Please enter a valid credit card number.","Please enter a valid credit card number."
 "Please enter a valid credit card verification number.","Please enter a valid credit card verification number."
+"Please enter a valid date between %s and %s","Please enter a valid date between %s and %s"
+"Please enter a valid date equal to or greater than %s","Please enter a valid date equal to or greater than %s"
+"Please enter a valid date less than or equal to %s","Please enter a valid date less than or equal to %s"
 "Please enter a valid date.","Please enter a valid date."
 "Please enter a valid day (1-%d).","Please enter a valid day (1-%d)."
 "Please enter a valid email address. For example johndoe@domain.com.","Please enter a valid email address. For example johndoe@domain.com."
@@ -204,6 +219,7 @@
 "Please select an option.","Please select an option."
 "Please select one of the above options.","Please select one of the above options."
 "Please select one of the options.","Please select one of the options."
+"Please set available and/or protected paths list(s) before validation.","Please set available and/or protected paths list(s) before validation."
 "Please specify either a category or a product, or both.","Please specify either a category or a product, or both."
 "Please specify payment method.","Please specify payment method."
 "Please specify shipping method.","Please specify shipping method."
@@ -223,6 +239,7 @@
 "Port (25)","Port (25)"
 "Profiler","Profiler"
 "Request Path for Specified Store","Request Path for Specified Store"
+"Requested file may not include parent directory traversal (""../"", ""..\\ notation)""","Requested file may not include parent directory traversal (""../"", ""..\\ notation)"""
 "Requested invalid store ""%s""","Requested invalid store ""%s"""
 "Resource is not set.","Resource is not set."
 "Return-Path Email","Return-Path Email"
@@ -267,6 +284,7 @@
 "System","System"
 "System Log File Name","System Log File Name"
 "Template Path Hints","Template Path Hints"
+"Template Settings","Template Settings"
 "Template Variables","Template Variables"
 "Templates","Templates"
 "Text length does not satisfy specified text range.","Text length does not satisfy specified text range."
@@ -327,6 +345,7 @@
 "Validation has failed.","Validation has failed."
 "Values less than 60 are ignored. Note that changes will apply after logout.","Values less than 60 are ignored. Note that changes will apply after logout."
 "Variable Code must be unique.","Variable Code must be unique."
+"Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.","Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk."
 "Web","Web"
 "Website","Website"
 "Website Information","Website Information"
@@ -335,13 +354,6 @@
 "Website with the same code","Website with the same code"
 "Weekend Days","Weekend Days"
 "Welcome Text","Welcome Text"
-"When changing media storage or selecting another media database,
-                                use the Synchronize function to transfer media to the selected
-                                storage. After synchronization is completed, all new media will be
-                                automatically placed to the selected media storage.","When changing media storage or selecting another media database,
-                                use the Synchronize function to transfer media to the selected
-                                storage. After synchronization is completed, all new media will be
-                                automatically placed to the selected media storage."
 "Wrong file info format","Wrong file info format"
 "Wrong number of arguments for %s","Wrong number of arguments for %s"
 "Yes","Yes"
diff --git a/app/locale/en_US/Mage_Customer.csv b/app/locale/en_US/Mage_Customer.csv
index 9cb2e3fd5a..e1fddf6e72 100644
--- a/app/locale/en_US/Mage_Customer.csv
+++ b/app/locale/en_US/Mage_Customer.csv
@@ -19,6 +19,16 @@
 """%s"" length must be equal to or greater than %s characters.","""%s"" length must be equal to or greater than %s characters."
 """%s"" length must be less than or equal to %s characters.","""%s"" length must be less than or equal to %s characters."
 """%s"" width exceeds allowed value of %s px.","""%s"" width exceeds allowed value of %s px."
+"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' appears to be a DNS hostname but cannot extract TLD part"
+"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' appears to be a DNS hostname but cannot match TLD against known list"
+"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'"
+"'%value%' appears to be a DNS hostname but contains a dash in an invalid position","'%value%' appears to be a DNS hostname but contains a dash in an invalid position"
+"'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded","'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded"
+"'%value%' appears to be a local network name but local network names are not allowed","'%value%' appears to be a local network name but local network names are not allowed"
+"'%value%' appears to be an IP address, but IP addresses are not allowed","'%value%' appears to be an IP address, but IP addresses are not allowed"
+"'%value%' does not appear to be a valid URI hostname","'%value%' does not appear to be a valid URI hostname"
+"'%value%' does not appear to be a valid local network name","'%value%' does not appear to be a valid local network name"
+"'%value%' does not match the expected structure for a DNS hostname","'%value%' does not match the expected structure for a DNS hostname"
 "* Required Fields","* Required Fields"
 "A new password has been sent.","A new password has been sent."
 "ALL GROUPS","ALL GROUPS"
@@ -94,12 +104,12 @@
 "Create customer address","Create customer address"
 "Current Password","Current Password"
 "Customer","Customer"
+"Customer API","Customer API"
 "Customer Account Edit Form","Customer Account Edit Form"
 "Customer Account Login Form","Customer Account Login Form"
 "Customer Account Logout Success","Customer Account Logout Success"
 "Customer Account Registration Form","Customer Account Registration Form"
 "Customer Addresses","Customer Addresses"
-"Customer Api","Customer Api"
 "Customer Configuration","Customer Configuration"
 "Customer Forgot Password Form","Customer Forgot Password Form"
 "Customer Group","Customer Group"
@@ -188,6 +198,7 @@
 "Invalid email address.","Invalid email address."
 "Invalid login or password.","Invalid login or password."
 "Invalid store specified, skipping the record.","Invalid store specified, skipping the record."
+"Invalid type given. String expected","Invalid type given. String expected"
 "Last Activity","Last Activity"
 "Last Date Subscribed","Last Date Subscribed"
 "Last Date Unsubscribed","Last Date Unsubscribed"
diff --git a/app/locale/en_US/Mage_Dataflow.csv b/app/locale/en_US/Mage_Dataflow.csv
index 1de330594b..60bb9f8ee4 100644
--- a/app/locale/en_US/Mage_Dataflow.csv
+++ b/app/locale/en_US/Mage_Dataflow.csv
@@ -1,10 +1,8 @@
 "<a href=""%s"" target=""_blank"">Link</a>","<a href=""%s"" target=""_blank"">Link</a>"
-"Access denied to destination folder ""%s"".","Access denied to destination folder ""%s""."
 "An error occurred while opening file: ""%s"".","An error occurred while opening file: ""%s""."
 "Could not load file: ""%s"".","Could not load file: ""%s""."
 "Could not save file: %s.","Could not save file: %s."
 "Declared adapter %s was not found.","Declared adapter %s was not found."
-"Destination folder ""%s"" does not exist or there is no access to create it.","Destination folder ""%s"" does not exist or there is no access to create it."
 "Destination folder ""%s"" is not a directory.","Destination folder ""%s"" is not a directory."
 "Destination folder ""%s"" is not writable.","Destination folder ""%s"" is not writable."
 "Done","Done"
diff --git a/app/locale/en_US/Mage_Directory.csv b/app/locale/en_US/Mage_Directory.csv
index 5ea2f83d0a..fcd4d9f899 100644
--- a/app/locale/en_US/Mage_Directory.csv
+++ b/app/locale/en_US/Mage_Directory.csv
@@ -6,7 +6,7 @@
 "Connection Timeout in Seconds","Connection Timeout in Seconds"
 "Continue &raquo;","Continue &raquo;"
 "Country","Country"
-"Country Api","Country Api"
+"Country API","Country API"
 "Country and Format Type combination should be unique","Country and Format Type combination should be unique"
 "Currency","Currency"
 "Currency Options","Currency Options"
@@ -29,7 +29,7 @@
 "List of regions in specified country","List of regions in specified country"
 "Postal Code is Optional for the following countries","Postal Code is Optional for the following countries"
 "Region","Region"
-"Region Api","Region Api"
+"Region API","Region API"
 "Scheduled Import Settings","Scheduled Import Settings"
 "Select Your Currency","Select Your Currency"
 "Service","Service"
diff --git a/app/locale/en_US/Mage_Downloadable.csv b/app/locale/en_US/Mage_Downloadable.csv
index 72cb41a1c9..519d34f49c 100644
--- a/app/locale/en_US/Mage_Downloadable.csv
+++ b/app/locale/en_US/Mage_Downloadable.csv
@@ -41,6 +41,8 @@
 "Open Links in New Window","Open Links in New Window"
 "Order #","Order #"
 "Order Item Status to Enable Downloads","Order Item Status to Enable Downloads"
+"Order id cannot be null","Order id cannot be null"
+"Order item id cannot be null","Order item id cannot be null"
 "Ordered","Ordered"
 "Out of stock","Out of stock"
 "Pending","Pending"
diff --git a/app/locale/en_US/Mage_GiftMessage.csv b/app/locale/en_US/Mage_GiftMessage.csv
index 08c68d5c13..7bb450a2f6 100644
--- a/app/locale/en_US/Mage_GiftMessage.csv
+++ b/app/locale/en_US/Mage_GiftMessage.csv
@@ -1,4 +1,7 @@
 "Add","Add"
+"Add gift message for shopping cart","Add gift message for shopping cart"
+"Add gift messages for quote item of shopping cart","Add gift messages for quote item of shopping cart"
+"Add gift messages to products of shopping cart","Add gift messages to products of shopping cart"
 "Add gift options","Add gift options"
 "Add gift options for Individual Items","Add gift options for Individual Items"
 "Add gift options for the Entire Order","Add gift options for the Entire Order"
@@ -12,6 +15,7 @@
 "Edit","Edit"
 "From","From"
 "Gift Message","Gift Message"
+"Gift Message API","Gift Message API"
 "Gift Options","Gift Options"
 "Gift Options for","Gift Options for"
 "Gift Options for Individual Items","Gift Options for Individual Items"
diff --git a/app/locale/en_US/Mage_GoogleBase.csv b/app/locale/en_US/Mage_GoogleBase.csv
index 17ea1555ea..c5138a2faf 100644
--- a/app/locale/en_US/Mage_GoogleBase.csv
+++ b/app/locale/en_US/Mage_GoogleBase.csv
@@ -14,6 +14,7 @@
 "Attributes Set","Attributes Set"
 "AuthSub","AuthSub"
 "Available Products","Available Products"
+"Base Currency should be set to %s for %s in system configuration. Otherwise item prices won't be correct in Google Base.","Base Currency should be set to %s for %s in system configuration. Otherwise item prices won't be correct in Google Base."
 "British Pound Sterling","British Pound Sterling"
 "Cannot update Google Base Item for Store '%s'","Cannot update Google Base Item for Store '%s'"
 "Captcha confirmation error: %s","Captcha confirmation error: %s"
@@ -60,7 +61,6 @@
 "No items were saved as inactive items","No items were saved as inactive items"
 "No products were added to Google Base","No products were added to Google Base"
 "Object model is not specified to save Google Base entry.","Object model is not specified to save Google Base entry."
-"Page views","Page views"
 "Please, select Attribute Set and Google Item Type to load attributes","Please, select Attribute Set and Google Item Type to load attributes"
 "Product Name","Product Name"
 "Publish","Publish"
diff --git a/app/locale/en_US/Mage_Newsletter.csv b/app/locale/en_US/Mage_Newsletter.csv
index 51c90185db..4c270c62e1 100644
--- a/app/locale/en_US/Mage_Newsletter.csv
+++ b/app/locale/en_US/Mage_Newsletter.csv
@@ -68,6 +68,7 @@
 "Paused","Paused"
 "Please enter a valid email address.","Please enter a valid email address."
 "Please enter new template name","Please enter new template name"
+"Please refer to exeption.log","Please refer to exeption.log"
 "Please select subscriber(s)","Please select subscriber(s)"
 "Preview","Preview"
 "Preview Template","Preview Template"
diff --git a/app/locale/en_US/Mage_Paygate.csv b/app/locale/en_US/Mage_Paygate.csv
index 23c3b1de08..967614d116 100644
--- a/app/locale/en_US/Mage_Paygate.csv
+++ b/app/locale/en_US/Mage_Paygate.csv
@@ -10,7 +10,7 @@
 "Authorize.Net Transaction ID %s","Authorize.Net Transaction ID %s"
 "Authorize.net","Authorize.net"
 "Cancel","Cancel"
-"Centinel Api URL","Centinel Api URL"
+"Centinel API URL","Centinel API URL"
 "Credit Card Types","Credit Card Types"
 "Credit Card Verification","Credit Card Verification"
 "Credit Card: xxxx-%s","Credit Card: xxxx-%s"
diff --git a/app/locale/en_US/Mage_Paypal.csv b/app/locale/en_US/Mage_Paypal.csv
index 24089dfa35..38d15c9386 100644
--- a/app/locale/en_US/Mage_Paypal.csv
+++ b/app/locale/en_US/Mage_Paypal.csv
@@ -31,7 +31,6 @@
 "Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).","Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile)."
 "Allowed Credit Card Types","Allowed Credit Card Types"
 "Also affects mini-shopping cart.","Also affects mini-shopping cart."
-"Api/Integration","Api/Integration"
 "Ask Customer","Ask Customer"
 "Attempted Authentication, Bad Result","Attempted Authentication, Bad Result"
 "Attempted Authentication, Good Result","Attempted Authentication, Good Result"
@@ -54,8 +53,7 @@
 "Can not send new order email.","Can not send new order email."
 "Cannot create target file for reading reports.","Cannot create target file for reading reports."
 "Centinel API URL","Centinel API URL"
-"Centinel Api URL","Centinel Api URL"
-"Centinel Custom Api URL","Centinel Custom Api URL"
+"Centinel Custom API URL","Centinel Custom API URL"
 "Change Payment Method","Change Payment Method"
 "Change Shipping Address","Change Shipping Address"
 "Charge-off","Charge-off"
@@ -160,6 +158,8 @@
 "Impossible to issue a refund transaction because the capture transaction does not exist.","Impossible to issue a refund transaction because the capture transaction does not exist."
 "Incentive","Incentive"
 "Initiation Date","Initiation Date"
+"Integral Evolution","Integral Evolution"
+"Integral Evolution Settings","Integral Evolution Settings"
 "Invoice ID","Invoice ID"
 "Issuer Liability","Issuer Liability"
 "It is recommended to set this value to ""Debit or Credit Card"" per store views.","It is recommended to set this value to ""Debit or Credit Card"" per store views."
@@ -225,6 +225,8 @@
 "Page Style","Page Style"
 "Part of the address information matched","Part of the address information matched"
 "Partner","Partner"
+"Pasarela integral","Pasarela integral"
+"Pasarela integral Settings","Pasarela integral Settings"
 "Password","Password"
 "Pay Now","Pay Now"
 "PayPal","PayPal"
@@ -237,6 +239,8 @@
 "PayPal Express Order Review Form","PayPal Express Order Review Form"
 "PayPal Fee Information","PayPal Fee Information"
 "PayPal Merchant Pages Style","PayPal Merchant Pages Style"
+"PayPal Pro","PayPal Pro"
+"PayPal Pro Settings","PayPal Pro Settings"
 "PayPal Product Logo","PayPal Product Logo"
 "PayPal Protection Bonus","PayPal Protection Bonus"
 "PayPal Reference ID","PayPal Reference ID"
@@ -385,9 +389,11 @@
 "Void","Void"
 "We prefer PayPal (150 X 40)","We prefer PayPal (150 X 40)"
 "We prefer PayPal (150 X 60)","We prefer PayPal (150 X 60)"
+"Website Payments Plus","Website Payments Plus"
+"Website Payments Plus Settings","Website Payments Plus Settings"
 "Website Payments Pro","Website Payments Pro"
 "Website Payments Pro (Payflow Edition) Settings","Website Payments Pro (Payflow Edition) Settings"
-"Website Payments Pro Hosted Solution (Website Payments Plus (JP) - Integral Evolution (FR) - PayPal Pro (IT) - Pasarela integral (ES))","Website Payments Pro Hosted Solution (Website Payments Plus (JP) - Integral Evolution (FR) - PayPal Pro (IT) - Pasarela integral (ES))"
+"Website Payments Pro Hosted Solution","Website Payments Pro Hosted Solution"
 "Website Payments Pro Hosted Solution Settings","Website Payments Pro Hosted Solution Settings"
 "Website Payments Pro Payflow Edition (includes Express Checkout)","Website Payments Pro Payflow Edition (includes Express Checkout)"
 "Website Payments Pro Settings","Website Payments Pro Settings"
diff --git a/app/locale/en_US/Mage_Sales.csv b/app/locale/en_US/Mage_Sales.csv
index 761b445bf8..11f39eebef 100644
--- a/app/locale/en_US/Mage_Sales.csv
+++ b/app/locale/en_US/Mage_Sales.csv
@@ -238,6 +238,7 @@
 "Hold order","Hold order"
 "ID","ID"
 "ID #","ID #"
+"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s""","IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s"""
 "If empty, the default description above will be used.","If empty, the default description above will be used."
 "If empty, the default error above will be used.","If empty, the default error above will be used."
 "If the invoice was created offline, try creating an offline creditmemo.","If the invoice was created offline, try creating an offline creditmemo."
@@ -527,7 +528,6 @@
 "Refunds","Refunds"
 "Registered a Void notification.","Registered a Void notification."
 "Registered notification about approved payment.","Registered notification about approved payment."
-"Registered notification about authorized amount of %s.","Registered notification about authorized amount of %s."
 "Registered notification about captured amount of %s.","Registered notification about captured amount of %s."
 "Registered notification about denied payment.","Registered notification about denied payment."
 "Registered notification about refunded amount of %s.","Registered notification about refunded amount of %s."
@@ -574,6 +574,7 @@
 "Save Status Assignment","Save Status Assignment"
 "Save in address book","Save in address book"
 "Schedule","Schedule"
+"Select","Select"
 "Select from existing customer addresses:","Select from existing customer addresses:"
 "Send Credit Memo Comment Email Copy To","Send Credit Memo Comment Email Copy To"
 "Send Credit Memo Email Copy To","Send Credit Memo Email Copy To"
@@ -692,7 +693,7 @@
 "This operation requires an existing transaction object.","This operation requires an existing transaction object."
 "This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed.","This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed."
 "This order no longer exists.","This order no longer exists."
-"This product does not have any configurable options.","This product does not have any configurable options."
+"This product does not have any configurable options","This product does not have any configurable options"
 "This product has not been configured.","This product has not been configured."
 "This profile state cannot be changed to ""%s"".","This profile state cannot be changed to ""%s""."
 "This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you wish to proceed?","This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you wish to proceed?"
diff --git a/app/locale/en_US/Mage_SalesRule.csv b/app/locale/en_US/Mage_SalesRule.csv
index 54b741c843..bb862cbb4d 100644
--- a/app/locale/en_US/Mage_SalesRule.csv
+++ b/app/locale/en_US/Mage_SalesRule.csv
@@ -36,6 +36,7 @@
 "Edit Rule","Edit Rule"
 "Edit Rule '%s'","Edit Rule '%s'"
 "Expire at: %s","Expire at: %s"
+"FOUND","FOUND"
 "Fixed amount discount","Fixed amount discount"
 "Fixed amount discount for whole cart","Fixed amount discount for whole cart"
 "For matching items only","For matching items only"
@@ -48,6 +49,7 @@
 "Item totals are not set for rule.","Item totals are not set for rule."
 "Labels","Labels"
 "Maximum Qty Discount is Applied To","Maximum Qty Discount is Applied To"
+"NOT FOUND","NOT FOUND"
 "NOT LOGGED IN","NOT LOGGED IN"
 "Name: %s","Name: %s"
 "New Rule","New Rule"
diff --git a/app/locale/en_US/Mage_XmlConnect.csv b/app/locale/en_US/Mage_XmlConnect.csv
index f461a7e767..3aadafe700 100644
--- a/app/locale/en_US/Mage_XmlConnect.csv
+++ b/app/locale/en_US/Mage_XmlConnect.csv
@@ -1,9 +1,14 @@
 " "," "
 " But cart has some errors."," But cart has some errors."
+"""Description"" is more than %d characters long","""Description"" is more than %d characters long"
 """Title"" is more than %d characters long","""Title"" is more than %d characters long"
 "%1$s has been added to your wishlist.","%1$s has been added to your wishlist."
 "%1$s incl tax.","%1$s incl tax."
+"%s API Key required.","%s API Key required."
+"%s Application ID required.","%s Application ID required."
+"%s Secret Key required.","%s Secret Key required."
 "%s has been added to your cart.","%s has been added to your cart."
+"(Includes more countries than those listed below. As the application owner, you are responsible for complying with country-specific laws related to the distribution or sale of your application into that country, including your home country.)","(Includes more countries than those listed below. As the application owner, you are responsible for complying with country-specific laws related to the distribution or sale of your application into that country, including your home country.)"
 "10:40 AM","10:40 AM"
 "80px x 80px","80px x 80px"
 "80x80 px","80x80 px"
@@ -17,7 +22,6 @@
 "Activate PayPal Checkout","Activate PayPal Checkout"
 "Activation Key","Activation Key"
 "Add App","Add App"
-"Add More Templates","Add More Templates"
 "Add New Template","Add New Template"
 "Add Page","Add Page"
 "Add to Cart","Add to Cart"
@@ -38,6 +42,7 @@
 "AirMail Template Preview","AirMail Template Preview"
 "AirMail message","AirMail message"
 "AirMail templates","AirMail templates"
+"All locations","All locations"
 "An account with this email address already exists.","An account with this email address already exists."
 "An error occurred while adding item to wishlist.","An error occurred while adding item to wishlist."
 "An error occurred while deleting the address.","An error occurred while deleting the address."
@@ -49,11 +54,15 @@
 "Analytics","Analytics"
 "Android","Android"
 "App Background","App Background"
-"App Background (landscape mode)","App Background (landscape mode)"
-"App Background (portrait mode)","App Background (portrait mode)"
+"App Background (landscape mode).","App Background (landscape mode)."
+"App Background (portrait mode).","App Background (portrait mode)."
+"App Background <br />(landscape mode)","App Background <br />(landscape mode)"
+"App Background <br />(portrait mode)","App Background <br />(portrait mode)"
+"App Background image missing.","App Background image missing."
 "App Code","App Code"
 "App Information","App Information"
 "App Name","App Name"
+"App Stores","App Stores"
 "App Submission History","App Submission History"
 "App Title","App Title"
 "App code required.","App code required."
@@ -63,13 +72,12 @@
 "App has been submitted.","App has been submitted."
 "App model not loaded.","App model not loaded."
 "App with specified code does not exist.","App with specified code does not exist."
-"Appears in the info section of your app (example:  Copyright 2010 – Your Company, Inc.)","Appears in the info section of your app (example:  Copyright 2010 – Your Company, Inc.)"
+"Appears in the info section of your app (example: Copyright 2010 – Your Company, Inc.)","Appears in the info section of your app (example: Copyright 2010 – Your Company, Inc.)"
 "Application","Application"
 "Application Key","Application Key"
 "Application Master Secret","Application Master Secret"
 "Application Name","Application Name"
 "Application Secret","Application Secret"
-"Apply Theme","Apply Theme"
 "Apply will automatically resize this image for display in the App Store and on users’ devices.  A gloss (i.e. gradient) will also be applied, so you do not need to apply a gradient.  Image must be at least 512x512","Apply will automatically resize this image for display in the App Store and on users’ devices.  A gloss (i.e. gradient) will also be applied, so you do not need to apply a gradient.  Image must be at least 512x512"
 "Are you sure you whant to cancel a message?","Are you sure you whant to cancel a message?"
 "Are you sure you whant to delete a message?","Are you sure you whant to delete a message?"
@@ -80,12 +88,17 @@
 "Back to App Edit","Back to App Edit"
 "Background Color","Background Color"
 "Banner on Home Screen","Banner on Home Screen"
+"Banner on Home Screen image missing.","Banner on Home Screen image missing."
 "Billing address has been set.","Billing address has been set."
 "Buy %1$s for %2$s","Buy %1$s for %2$s"
 "Buy %1$s for %2$s (%3$s incl. tax) each","Buy %1$s for %2$s (%3$s incl. tax) each"
 "Buy %1$s for %2$s each","Buy %1$s for %2$s each"
+"Buyer country is not allowed by store.","Buyer country is not allowed by store."
+"Cache Lifetime (seconds)","Cache Lifetime (seconds)"
+"Cache Management","Cache Management"
 "Can\'t add item to shopping cart.","Can\'t add item to shopping cart."
 "Can\'t apply the coupon code.","Can\'t apply the coupon code."
+"Can\'t copy file ""%s"" to ""%s"".","Can\'t copy file ""%s"" to ""%s""."
 "Can\'t create wishlist.","Can\'t create wishlist."
 "Can\'t load XML.","Can\'t load XML."
 "Can\'t load application with code ""%s""","Can\'t load application with code ""%s"""
@@ -101,7 +114,6 @@
 "Can\'t submit application.","Can\'t submit application."
 "Can\'t update cart.","Can\'t update cart."
 "Can\'t write to file ""%s"".","Can\'t write to file ""%s""."
-"Can\t copy file ""%s"" to ""%s"".","Can\t copy file ""%s"" to ""%s""."
 "Cancel","Cancel"
 "Canceled","Canceled"
 "Cancelled","Cancelled"
@@ -114,13 +126,13 @@
 "Cart has been updated.","Cart has been updated."
 "Cart has some errors.","Cart has some errors."
 "Cart is empty.","Cart is empty."
-"Cart line items are not eligible for exporting to PayPal API","Cart line items are not eligible for exporting to PayPal API"
 "Catalog Only App?","Catalog Only App?"
 "Category Button Color","Category Button Color"
 "Category Item Background Color","Category Item Background Color"
 "Chairs","Chairs"
 "Change Orientation","Change Orientation"
 "Change Password","Change Password"
+"Changes have been saved to theme.","Changes have been saved to theme."
 "Checkout has been initialized.","Checkout has been initialized."
 "City","City"
 "Color Themes","Color Themes"
@@ -134,8 +146,10 @@
 "Content","Content"
 "Copyright","Copyright"
 "Copyright Page Logo","Copyright Page Logo"
+"Copyright Page Logo <br />(iPhone 4 retina)","Copyright Page Logo <br />(iPhone 4 retina)"
 "Copyright page logo","Copyright page logo"
 "Country","Country"
+"Country options don\'t recognized for ""%s"".","Country options don\'t recognized for ""%s""."
 "Coupon code %s is not valid.","Coupon code %s is not valid."
 "Coupon code %s was applied.","Coupon code %s was applied."
 "Coupon code is empty.","Coupon code is empty."
@@ -145,7 +159,9 @@
 "Credit Card Type","Credit Card Type"
 "Credit card number does not match credit card type.","Credit card number does not match credit card type."
 "Current Password","Current Password"
+"Currently, PayPal MEP is not available for the Android application","Currently, PayPal MEP is not available for the Android application"
 "Custom App Icon","Custom App Icon"
+"Custom App Icon <br />(iPhone 4 retina)","Custom App Icon <br />(iPhone 4 retina)"
 "Custom Colors","Custom Colors"
 "Custom application icon","Custom application icon"
 "Customer authentication problem.","Customer authentication problem."
@@ -161,13 +177,16 @@
 "Delete","Delete"
 "Deleted","Deleted"
 "Description","Description"
-"Description that appears in the iTunes App Store. 4000 chars maximum. ","Description that appears in the iTunes App Store. 4000 chars maximum. "
+"Description that appears in Android Market. %s chars maximum. ","Description that appears in Android Market. %s chars maximum. "
+"Description that appears in the iTunes App Store. %s chars maximum. ","Description that appears in the iTunes App Store. %s chars maximum. "
+"Deselect All","Deselect All"
 "Design","Design"
 "Device","Device"
 "Device Information","Device Information"
 "Device Type","Device Type"
 "Device doesn\'t recognized. Unable to load a template.","Device doesn\'t recognized. Unable to load a template."
 "Device doesn\'t recognized: ""%s"". Unable to load a helper.","Device doesn\'t recognized: ""%s"". Unable to load a helper."
+"Device doesn\'t recognized: ""%s"". Unable to load preview model.","Device doesn\'t recognized: ""%s"". Unable to load preview model."
 "Edit","Edit"
 "Edit AirMail Message","Edit AirMail Message"
 "Edit AirMail Message Queue #%s","Edit AirMail Message Queue #%s"
@@ -177,10 +196,14 @@
 "Email","Email"
 "Email Address","Email Address"
 "Enable AirMail Message Push notification","Enable AirMail Message Push notification"
+"Enable Facebook","Enable Facebook"
 "Enable Flurry Analytics","Enable Flurry Analytics"
 "Enable Flurry Analytics for the merchant.","Enable Flurry Analytics for the merchant."
+"Enable LinkedIn","Enable LinkedIn"
 "Enable Standard Checkout","Enable Standard Checkout"
+"Enable Twitter","Enable Twitter"
 "Error while processing file ""%s"".","Error while processing file ""%s""."
+"Error while reading data from Payment Bridge. Please, try again.","Error while reading data from Payment Bridge. Please, try again."
 "Error while uploading file ""%s"".","Error while uploading file ""%s""."
 "Error while uploading file ""%s"". Disallowed file type. Only ""jpg"", ""jpeg"", ""gif"", ""png"" are allowed.","Error while uploading file ""%s"". Disallowed file type. Only ""jpg"", ""jpeg"", ""gif"", ""png"" are allowed."
 "Error.","Error."
@@ -188,12 +211,15 @@
 "Expiration Date - Year","Expiration Date - Year"
 "Extensions","Extensions"
 "FILTERS APPLIED","FILTERS APPLIED"
+"Facebook API","Facebook API"
+"Facebook Application ID","Facebook Application ID"
 "Fax","Fax"
+"File can\'t be uploaded.","File can\'t be uploaded."
 "File doesn\'t exist ""%s"".","File doesn\'t exist ""%s""."
 "First Name","First Name"
+"Flurry API Code","Flurry API Code"
 "Flurry Analytics","Flurry Analytics"
 "Flurry Analytics Site","Flurry Analytics Site"
-"Flurry Api Code","Flurry Api Code"
 "Fonts","Fonts"
 "Free","Free"
 "Funk Leaf","Funk Leaf"
@@ -205,14 +231,23 @@
 "Guest","Guest"
 "Header Background Color","Header Background Color"
 "Header Font Color","Header Font Color"
+"High Resolution Application Icon","High Resolution Application Icon"
 "Home","Home"
 "Hot Red","Hot Red"
 "ID","ID"
+"Icon that will appear on the user\'s device after they download your app. Recommended size: 48px x 48px.","Icon that will appear on the user\'s device after they download your app. Recommended size: 48px x 48px."
+"Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 72px x 72px.","Icon that will appear on the user\'s device after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 72px x 72px."
+"Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 114px x 114px.","Icon that will appear on the user\'s phone after they download your app. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Recommended size: 114px x 114px."
 "Icon that will appear on the user’s phone after they download your app.  You do not need to apply a gradient or soft edges (this is done automatically by Apple).  Recommended size: 57px x 57px at 72 dpi.","Icon that will appear on the user’s phone after they download your app.  You do not need to apply a gradient or soft edges (this is done automatically by Apple).  Recommended size: 57px x 57px at 72 dpi."
 "Icons","Icons"
 "If leave this field empty, the message will be sent immediately","If leave this field empty, the message will be sent immediately"
+"If you want to disable the cache on the application side, leave the field empty. Warning! When disabling cache, the application will take time to load each page.","If you want to disable the cache on the application side, leave the field empty. Warning! When disabling cache, the application will take time to load each page."
 "Image file was not found.","Image file was not found."
+"Image that appears on first screen while your app is loading. Required size: 1024px x 768px.","Image that appears on first screen while your app is loading. Required size: 1024px x 768px."
+"Image that appears on first screen while your app is loading. Required size: 320px x 455px.","Image that appears on first screen while your app is loading. Required size: 320px x 455px."
 "Image that appears on first screen while your app is loading. Required size: 320px x 460px.","Image that appears on first screen while your app is loading. Required size: 320px x 460px."
+"Image that appears on first screen while your app is loading. Required size: 640px x 920px.","Image that appears on first screen while your app is loading. Required size: 640px x 920px."
+"Image that appears on first screen while your app is loading. Required size: 768px x 1024px.","Image that appears on first screen while your app is loading. Required size: 768px x 1024px."
 "Images","Images"
 "In Queue","In Queue"
 "In Stock","In Stock"
@@ -239,10 +274,19 @@
 "Large iTunes Icon","Large iTunes Icon"
 "Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Required size: 512px x 512px.","Large icon that appears in the iTunes App Store. You do not need to apply a gradient or soft edges (this is done automatically by Apple). Required size: 512px x 512px."
 "Last Name","Last Name"
+"LinkedIn API","LinkedIn API"
+"LinkedIn API Key","LinkedIn API Key"
+"LinkedIn Secret Key","LinkedIn Secret Key"
 "Loader Splash Screen","Loader Splash Screen"
+"Loader Splash Screen <br />(iPhone 4 retina)","Loader Splash Screen <br />(iPhone 4 retina)"
+"Loader Splash Screen <br />(landscape mode)","Loader Splash Screen <br />(landscape mode)"
+"Loader Splash Screen <br />(portrait mode)","Loader Splash Screen <br />(portrait mode)"
+"Loading Preview...","Loading Preview..."
+"Locations","Locations"
 "Log In","Log In"
 "Login and password are required.","Login and password are required."
 "Logo in Header","Logo in Header"
+"Logo in Header image missing.","Logo in Header image missing."
 "Logout complete.","Logout complete."
 "MEP is PayPal`s native checkout experience for the iPhone. You can choose to use MEP alongside standard checkout, or use it as your only checkout method for Magento mobile. PayPal MEP requires a <a href=""%s"">PayPal business account</a>","MEP is PayPal`s native checkout experience for the iPhone. You can choose to use MEP alongside standard checkout, or use it as your only checkout method for Magento mobile. PayPal MEP requires a <a href=""%s"">PayPal business account</a>"
 "Mailbox title","Mailbox title"
@@ -259,35 +303,38 @@
 "Message Templates","Message Templates"
 "Message Title","Message Title"
 "Message Type","Message Type"
-"Message can not be edited when it\'s status NOT is ""IN QUEUE"".","Message can not be edited when it\'s status NOT is ""IN QUEUE""."
+"Message can be edited when status of the message is ""IN QUEUE"" only.","Message can be edited when status of the message is ""IN QUEUE"" only."
 "Message content","Message content"
 "Message title","Message title"
-"Messages cannot be sent more than %d times in an hour.","Messages cannot be sent more than %d times in an hour."
 "Mobile","Mobile"
 "More","More"
 "More Info","More Info"
 "More Tabs","More Tabs"
 "Name on Card","Name on Card"
-"Name that appears beneath your app when users install it to their device. We recommend choosing a name that is 10-12 characters and that your customers will recognize.","Name that appears beneath your app when users install it to their device. We recommend choosing a name that is 10-12 characters and that your customers will recognize."
+"Name that appears beneath your app when users install it to their device. We recommend choosing a name that is 10-12 characters and that your customers will recognize. %s chars max.","Name that appears beneath your app when users install it to their device. We recommend choosing a name that is 10-12 characters and that your customers will recognize. %s chars max."
 "New AirMail Message","New AirMail Message"
 "New AirMail Message Queue","New AirMail Message Queue"
 "New App","New App"
 "New Password","New Password"
 "New Template","New Template"
+"Nickname","Nickname"
 "No items were specifed to update.","No items were specifed to update."
 "No items were updated.","No items were updated."
 "No product selected.","No product selected."
 "No such file ""%s"".","No such file ""%s""."
 "Not Submitted","Not Submitted"
-"One or more keywords that describe your app. Keywords are matched to users` searches in the App Store and help return accurate search results. Separate multiple keywords with commas. 100 chars is maximum.","One or more keywords that describe your app. Keywords are matched to users` searches in the App Store and help return accurate search results. Separate multiple keywords with commas. 100 chars is maximum."
+"Notice","Notice"
+"One or more keywords that describe your app. Keywords are matched to users\' searches in the App Store and help return accurate search results. Separate multiple keywords with commas. 100 chars is maximum.","One or more keywords that describe your app. Keywords are matched to users\' searches in the App Store and help return accurate search results. Separate multiple keywords with commas. 100 chars is maximum."
 "Onepage checkout is disabled.","Onepage checkout is disabled."
 "Only free apps are allowed in this version.","Only free apps are allowed in this version."
+"Only registered users can write reviews. Please, log in or register.","Only registered users can write reviews. Please, log in or register."
 "Options menu items","Options menu items"
 "POST data is not valid.","POST data is not valid."
 "Pages","Pages"
 "Password","Password"
 "Password fields cannot be empty.","Password fields cannot be empty."
 "PayPal Mobile Embedded Payment (MEP)","PayPal Mobile Embedded Payment (MEP)"
+"Payment Bridge module unavailable.","Payment Bridge module unavailable."
 "Payment Method has been set.","Payment Method has been set."
 "Payment Methods","Payment Methods"
 "Payment method was successfully set.","Payment method was successfully set."
@@ -300,6 +347,7 @@
 "Please enter issue number or start date for switch/solo card type.","Please enter issue number or start date for switch/solo card type."
 "Please enter the Activation Key.","Please enter the Activation Key."
 "Please enter the Copyright.","Please enter the Copyright."
+"Please enter the Description.","Please enter the Description."
 "Please enter the Price.","Please enter the Price."
 "Please enter the Resubmission Key.","Please enter the Resubmission Key."
 "Please enter the Title.","Please enter the Title."
@@ -332,23 +380,22 @@
 "Queue Message","Queue Message"
 "Queue does not exist.","Queue does not exist."
 "Quote instance is required.","Quote instance is required."
+"Recipient Information","Recipient Information"
 "Recommended size 1024px x 704px. Note: Image size affects the performance of your app.","Recommended size 1024px x 704px. Note: Image size affects the performance of your app."
 "Recommended size 320px x 230px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.","Recommended size 320px x 230px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance."
 "Recommended size 320px x 258px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance.","Recommended size 320px x 258px. Note: Image size affects the performance of your app. Keep your image size below 50 KB for optimal performance."
 "Recommended size 320px x 367px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance.","Recommended size 320px x 367px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance."
-"Recommended size 320px x 410px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance.","Recommended size 320px x 410px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance."
 "Recommended size 35px x 35px.","Recommended size 35px x 35px."
-"Recommended size 480px x 250px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance.","Recommended size 480px x 250px. Note: Image size affects the performance of your app. Keep your image size below 75 KB for optimal performance."
 "Recommended size 768px x 294px. Note: Image size affects the performance of your app.","Recommended size 768px x 294px. Note: Image size affects the performance of your app."
 "Recommended size 768px x 960px. Note: Image size affects the performance of your app.","Recommended size 768px x 960px. Note: Image size affects the performance of your app."
 "Regular and confirmation passwords must be equal","Regular and confirmation passwords must be equal"
 "Related Product Background Color","Related Product Background Color"
-"Reset","Reset"
-"Reset Successful","Reset Successful"
+"Reset theme to default","Reset theme to default"
 "Resubmission Key","Resubmission Key"
 "Resubmit","Resubmit"
 "Resubmit App","Resubmit App"
 "Resubmit Application","Resubmit Application"
+"Review","Review"
 "SORT BY:","SORT BY:"
 "Save","Save"
 "Save Theme","Save Theme"
@@ -360,14 +407,16 @@
 "Search","Search"
 "Secondary Color","Secondary Color"
 "Secondary Font Color","Secondary Font Color"
-"Select Template","Select Template"
+"Select All","Select All"
 "Selected product is unavailable.","Selected product is unavailable."
+"Sender Information","Sender Information"
 "Settings","Settings"
 "Shipping address has been set.","Shipping address has been set."
 "Shipping method has been set.","Shipping method has been set."
 "Shop","Shop"
 "Shopping cart is empty.","Shopping cart is empty."
 "Sky Blue","Sky Blue"
+"Social Networking","Social Networking"
 "Some emails were not sent.","Some emails were not sent."
 "Sorry, no payment options are available for this order at this time.","Sorry, no payment options are available for this order at this time."
 "Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
@@ -384,6 +433,7 @@
 "Status","Status"
 "Store View","Store View"
 "Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px.","Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px."
+"Store logo that is displayed on copyright page of app. Preferred size: 200px x 200px.","Store logo that is displayed on copyright page of app. Preferred size: 200px x 200px."
 "Store logo that will be displayed on copyright page of application ","Store logo that will be displayed on copyright page of application "
 "Street Address","Street Address"
 "Street Address 2","Street Address 2"
@@ -399,6 +449,7 @@
 "Submitted","Submitted"
 "Subtotal (Excl. Tax)","Subtotal (Excl. Tax)"
 "Subtotal (Incl. Tax)","Subtotal (Incl. Tax)"
+"Summary of Your Review","Summary of Your Review"
 "T-Shirts","T-Shirts"
 "Tabs","Tabs"
 "Telephone","Telephone"
@@ -415,7 +466,8 @@
 "Thank you for registering!","Thank you for registering!"
 "Thank you for your purchase! ","Thank you for your purchase! "
 "The Mailbox title will be shown in the More Info tab. To understand more about the title, please <a target=""_blank"" href=""http://www.magentocommerce.com/img/product/mobile/helpers/mail_box_title.png"">click here</a>","The Mailbox title will be shown in the More Info tab. To understand more about the title, please <a target=""_blank"" href=""http://www.magentocommerce.com/img/product/mobile/helpers/mail_box_title.png"">click here</a>"
-"Theme has been saved.","Theme has been saved."
+"The icon that appears in the Android Market. Recommended size: 512px x 512px. Maximum size: 1024 KB.","The icon that appears in the Android Market. Recommended size: 512px x 512px. Maximum size: 1024 KB."
+"Theme configurations are successfully reset.","Theme configurations are successfully reset."
 "Theme name is not set.","Theme name is not set."
 "There were some problems with the data.","There were some problems with the data."
 "This email address was not found in our records.","This email address was not found in our records."
@@ -427,6 +479,9 @@
 "Title bar","Title bar"
 "To activate PayPal MEP payment method activate Express checkout first. ","To activate PayPal MEP payment method activate Express checkout first. "
 "Total incl. Tax: %1$s","Total incl. Tax: %1$s"
+"Twitter API","Twitter API"
+"Twitter API Key","Twitter API Key"
+"Twitter Secret Key","Twitter Secret Key"
 "Unable to cancel queue.","Unable to cancel queue."
 "Unable to collect cart totals.","Unable to collect cart totals."
 "Unable to delete queue.","Unable to delete queue."
@@ -437,6 +492,7 @@
 "Unable to load application form.","Unable to load application form."
 "Unable to load product info.","Unable to load product info."
 "Unable to place the order.","Unable to place the order."
+"Unable to post the review.","Unable to post the review."
 "Unable to process preview.","Unable to process preview."
 "Unable to save app.","Unable to save app."
 "Unable to save message.","Unable to save message."
@@ -459,7 +515,6 @@
 "Wishlist has been cleared.","Wishlist has been cleared."
 "Wishlist has been updated.","Wishlist has been updated."
 "Wishlist has been updated. But there are accrued some errors while updating some items.","Wishlist has been updated. But there are accrued some errors while updating some items."
-"Wrong Android background image orientation has been specified: ""%s"".","Wrong Android background image orientation has been specified: ""%s""."
 "Wrong Ipad background image orientation has been specified: ""%s"".","Wrong Ipad background image orientation has been specified: ""%s""."
 "Wrong device type.","Wrong device type."
 "Wrong email format","Wrong email format"
@@ -470,6 +525,7 @@
 "You can watch statistics here.","You can watch statistics here."
 "You will receive an order confirmation email with details of your order and a link to track its progress.","You will receive an order confirmation email with details of your order and a link to track its progress."
 "Your order # is: %s. ","Your order # is: %s. "
+"Your review has been accepted for moderation.","Your review has been accepted for moderation."
 "Zip/Postal Code","Zip/Postal Code"
 "and","and"
 "each","each"
diff --git a/downloader/lib/Mage/Connect/Packager.php b/downloader/lib/Mage/Connect/Packager.php
index 46a7019993..e7fcca12fa 100644
--- a/downloader/lib/Mage/Connect/Packager.php
+++ b/downloader/lib/Mage/Connect/Packager.php
@@ -397,7 +397,7 @@ public function processInstallPackage($package, $file, $configObj)
      */
     public function getLocalModifiedFiles($chanName, $package, $cacheObj, $configObj)
     {
-        $p = $cachObj->getPackageObject($chanName, $package);
+        $p = $cacheObj->getPackageObject($chanName, $package);
         $hashContents = $p->getHashContents();
         $listModified = array();
         foreach ($hashContents as $file=>$hash) {
@@ -479,7 +479,7 @@ public function getUpgradesList($channels, $cacheObject, $configObj, $restObj =
             /**
              * Iterate packages of channel $chan
              */
-            $state = $configObj->preferred_state ? $configObj->preferred_state : "devel";
+            $state = $configObj->preferred_state ? $configObj->preferred_state : "stable";
 
             foreach($localPackages as $localName=>$localData) {
                 if(!isset($remotePackages[$localName])) {
@@ -577,7 +577,13 @@ public function getUninstallList($chanName, $package, $cache, $config, $withDeps
             }
 
         } catch (Exception $e) {
-            //$this->_failed[] = array('name'=>$package, 'channel'=>$chanName, 'max'=>$versionMax, 'min'=>$versionMin, 'reason'=>$e->getMessage());
+//            $this->_failed[] = array(
+//                'name'=>$package,
+//                'channel'=>$chanName,
+//                'max'=>$versionMax,
+//                'min'=>$versionMin,
+//                'reason'=>$e->getMessage()
+//            );
         }
 
         $level--;
@@ -602,11 +608,11 @@ public function getUninstallList($chanName, $package, $cache, $config, $withDeps
      * @param array $dependencies Package dependencies
      */
     private function addHashData(&$hash, $name, $channel, $downloaded_version = '', $stability = '', $versionMin = '',
-            $versionMax = '', $install_state = '', $message = '', $dependencies = '') 
+            $versionMax = '', $install_state = '', $message = '', $dependencies = '')
     {
             /**
-             * @todo When we are building dependencies tree we should base this calculations not on full key as on a 
-             * unique value but check it by parts. First part which should be checked is EXTENSION_NAME also this 
+             * @todo When we are building dependencies tree we should base this calculations not on full key as on a
+             * unique value but check it by parts. First part which should be checked is EXTENSION_NAME also this
              * part should be unique globally not per channel.
              */
             //$key = $chanName . "/" . $package;
@@ -619,7 +625,8 @@ private function addHashData(&$hash, $name, $channel, $downloaded_version = '',
                 'min' => $versionMin,
                 'max' => $versionMax,
                 'install_state' => $install_state,
-                'message' => (isset($this->install_states[$install_state]) ? $this->install_states[$install_state] : '').$message,
+                'message' => (isset($this->install_states[$install_state]) ?
+                        $this->install_states[$install_state] : '').$message,
                 'packages' => $dependencies,
             );
 
@@ -668,9 +675,18 @@ public function getDependenciesList( $chanName, $package, $cache, $config, $vers
             if (!$releases || !count($releases)) {
                 throw new Exception("No releases for '{$package}', skipping");
             }
-            $state = $config->preferred_state ? $config->preferred_state : 'devel';
+            $state = $config->preferred_state ? $config->preferred_state : 'stable';
             $version = $cache->detectVersionFromRestArray($releases, $versionMin, $versionMax, $state);
-            if(!$version) {
+            if (!$version) {
+                $versionState = $cache->detectVersionFromRestArray($releases, $versionMin, $versionMax);
+                if ($versionState) {
+                    $packageInfo = $rest->getPackageReleaseInfo($package, $versionState);
+                    if (false !== $packageInfo) {
+                        $stability = $packageInfo->getStability();
+                        throw new Exception("Extension is '{$stability}' please check(or change) stability settings".
+                                            " on Magento Connect Manager");
+                    }
+                }
                 throw new Exception("Version for '{$package}' was not detected");
             }
             $packageInfo = $rest->getPackageReleaseInfo($package, $version);
@@ -720,7 +736,7 @@ public function getDependenciesList( $chanName, $package, $cache, $config, $vers
                     $dependencies[$row['name']] = $row;
                 }
             }
-            
+
             /**
              * @todo When we are building dependencies tree we should base this calculations not on full key as on a
              * unique value but check it by parts. First part which should be checked is EXTENSION_NAME also this part
@@ -742,7 +758,7 @@ public function getDependenciesList( $chanName, $package, $cache, $config, $vers
                     }
                     $method = __FUNCTION__;
                     /**
-                     * @todo When we are building dependencies tree we should base this calculations not on full key as 
+                     * @todo When we are building dependencies tree we should base this calculations not on full key as
                      * on a unique value but check it by parts. First part which should be checked is EXTENSION_NAME
                      * also this part should be unique globally not per channel.
                      */
@@ -801,7 +817,13 @@ public function getDependenciesList( $chanName, $package, $cache, $config, $vers
             }
             unset($rest);
         } catch (Exception $e) {
-            $_failed[] = array('name'=>$package, 'channel'=>$chanName, 'max'=>$versionMax, 'min'=>$versionMin, 'reason'=>$e->getMessage());
+            $_failed[] = array(
+                'name'=>$package,
+                'channel'=>$chanName,
+                'max'=>$versionMax,
+                'min'=>$versionMin,
+                'reason'=>$e->getMessage()
+            );
         }
 
 
diff --git a/get.php b/get.php
new file mode 100644
index 0000000000..12595ffe99
--- /dev/null
+++ b/get.php
@@ -0,0 +1,201 @@
+<?php
+
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category   Mage
+ * @package    Mage
+ * @copyright  Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+if (version_compare(phpversion(), '5.2.0', '<')===true) {
+    echo  '<div style="font:12px/1.35em arial, helvetica, sans-serif;"><div style="margin:0 0 25px 0; '
+        . 'border-bottom:1px solid #ccc;"><h3 style="margin:0; font-size:1.7em; font-weight:normal; '
+        . 'text-transform:none; text-align:left; color:#2f2f2f;">Whoops, it looks like you have an invalid PHP version.'
+        . '</h3></div><p>Magento supports PHP 5.2.0 or newer. <a href="http://www.magentocommerce.com/install" '
+        . 'target="">Find out</a> how to install</a> Magento using PHP-CGI as a work-around.</p></div>';
+    exit;
+}
+$start = microtime(true);
+/**
+ * Error reporting
+ */
+error_reporting(E_ALL | E_STRICT);
+ini_set('display_errors', 1);
+
+$ds = DIRECTORY_SEPARATOR;
+$ps = PATH_SEPARATOR;
+$bp = dirname(__FILE__);
+
+/**
+ * Set include path
+ */
+
+$paths[] = $bp . $ds . 'app' . $ds . 'code' . $ds . 'local';
+$paths[] = $bp . $ds . 'app' . $ds . 'code' . $ds . 'community';
+$paths[] = $bp . $ds . 'app' . $ds . 'code' . $ds . 'core';
+$paths[] = $bp . $ds . 'lib';
+
+$appPath = implode($ps, $paths);
+set_include_path($appPath . $ps . get_include_path());
+
+include_once 'Mage/Core/functions.php';
+include_once 'Varien/Autoload.php';
+
+Varien_Autoload::register();
+
+$varDirectory = $bp . $ds . Mage_Core_Model_Config_Options::VAR_DIRECTORY;
+
+$configCacheFile = $varDirectory . $ds . 'resource_config.json';
+
+$mediaDirectory = null;
+$allowedResources = array();
+
+if (file_exists($configCacheFile) && is_readable($configCacheFile)) {
+    $config = json_decode(file_get_contents($configCacheFile), true);
+
+    //checking update time
+    if (filemtime($configCacheFile) + $config['update_time'] > time()) {
+        $mediaDirectory = trim(str_replace($bp . $ds, '', $config['media_directory']), $ds);
+        $allowedResources = array_merge($allowedResources, $config['allowed_resources']);
+    }
+}
+
+$request = new Zend_Controller_Request_Http();
+
+$pathInfo = str_replace('..', '', ltrim($request->getPathInfo(), '/'));
+
+$filePath = str_replace('/', $ds, rtrim($bp, $ds) . $ds . $pathInfo);
+
+if ($mediaDirectory) {
+    if (0 !== stripos($pathInfo, $mediaDirectory . '/')) {
+        sendNotFoundPage();
+    }
+
+    $relativeFilename = str_replace($mediaDirectory . '/', '', $pathInfo);
+    checkResource($relativeFilename, $allowedResources);
+    sendFile($filePath);
+}
+
+$mageFilename = 'app/Mage.php';
+
+if (!file_exists($mageFilename)) {
+    echo $mageFilename . ' was not found';
+}
+
+require_once $mageFilename;
+
+umask(0);
+
+/* Store or website code */
+$mageRunCode = isset($_SERVER['MAGE_RUN_CODE']) ? $_SERVER['MAGE_RUN_CODE'] : '';
+
+/* Run store or run website */
+$mageRunType = isset($_SERVER['MAGE_RUN_TYPE']) ? $_SERVER['MAGE_RUN_TYPE'] : 'store';
+
+if (empty($mediaDirectory)) {
+    Mage::init($mageRunCode, $mageRunType);
+} else {
+    Mage::init($mageRunCode, $mageRunType, array(), array('Mage_Core'));
+}
+
+if (!$mediaDirectory) {
+    $config = Mage_Core_Model_File_Storage::getScriptConfig();
+    $mediaDirectory = str_replace($bp . $ds, '', $config['media_directory']);
+    $allowedResources = array_merge($allowedResources, $config['allowed_resources']);
+
+    $relativeFilename = str_replace($mediaDirectory . '/', '', $pathInfo);
+
+    $fp = fopen($configCacheFile, 'w');
+    if (flock($fp, LOCK_EX | LOCK_NB)) {
+        ftruncate($fp, 0);
+        fwrite($fp, json_encode($config));
+    }
+    flock($fp, LOCK_UN);
+    fclose($fp);
+
+    checkResource($relativeFilename, $allowedResources);
+}
+
+if (0 !== stripos($pathInfo, $mediaDirectory . '/')) {
+    sendNotFoundPage();
+}
+
+$databaseFileSotrage = Mage::getModel('core/file_storage_database');
+$databaseFileSotrage->loadByFilename($relativeFilename);
+
+if ($databaseFileSotrage->getId()) {
+    $directory = dirname($filePath);
+    if (!is_dir($directory)) {
+        mkdir($directory, 0777, true);
+    }
+
+    $fp = fopen($filePath, 'w');
+    if (flock($fp, LOCK_EX | LOCK_NB)) {
+        ftruncate($fp, 0);
+        fwrite($fp, $databaseFileSotrage->getContent());
+    }
+    flock($fp, LOCK_UN);
+    fclose($fp);
+}
+
+sendFile($filePath);
+sendNotFoundPage();
+
+/**
+ * Send 404
+ */
+function sendNotFoundPage()
+{
+    header('HTTP/1.0 404 Not Found');
+    exit;
+}
+
+/**
+ * Check resource by whitelist
+ *
+ * @param string $resource
+ * @param array $allowedResources
+ */
+function checkResource($resource, array $allowedResources)
+{
+    $isResourceAllowed = false;
+    foreach ($allowedResources as $allowedResource) {
+        if (0 === stripos($resource, $allowedResource)) {
+            $isResourceAllowed = true;
+        }
+    }
+
+    if (!$isResourceAllowed) {
+        sendNotFoundPage();
+    }
+}
+/**
+ * Send file to browser
+ *
+ * @param string $file
+ */
+function sendFile($file)
+{
+    if (file_exists($file) || is_readable($file)) {
+        $transfer = new Varien_File_Transfer_Adapter_Http();
+        $transfer->send($file);
+        exit;
+    }
+}
diff --git a/js/mage/adminhtml/moneybookers.js b/js/mage/adminhtml/moneybookers.js
index a41ad644e3..078b72f32e 100644
--- a/js/mage/adminhtml/moneybookers.js
+++ b/js/mage/adminhtml/moneybookers.js
@@ -46,6 +46,24 @@ Moneybookers.prototype = {
         $("moneybookers_settings_customer_id_hidden").name = document.getElementById("moneybookers_settings_customer_id").name;
         $("moneybookers_settings_customer_id_hidden").value = document.getElementById("moneybookers_settings_customer_id").value;
         $("moneybookers_settings_secret_key").setAttribute("onchange", "moneybookers.setStatus(2); moneybookers.changeUi();");
+
+        if (this.isStoreView()) {
+            this.infoOrig = {
+                email: $("moneybookers_settings_moneybookers_email").value,
+                customerId: $("moneybookers_settings_customer_id").value,
+                key: $("moneybookers_settings_secret_key").value,
+                status: this.getStatus(),
+                useDefult: $("moneybookers_settings_moneybookers_email_inherit").checked
+            };
+            var defaults = $$("#row_moneybookers_settings_customer_id .use-default, #row_moneybookers_settings_secret_key .use-default, #row_moneybookers_settings_activationstatus .use-default");
+            if (Object.isArray(defaults)) {
+                for (var i=0; i<defaults.length; i++) {
+                    defaults[i].hide();
+                }
+            }
+            $("moneybookers_settings_moneybookers_email_inherit").setAttribute("onchange", "moneybookers.changeStore();");
+        }
+
         this.changeUi();
     },
 
@@ -152,11 +170,43 @@ Moneybookers.prototype = {
         }
         if (status == 2) {
             $("moneybookers_multifuncbutton_label").update(this.txtBtnStatus2);
+            if (this.isStoreView()) {
+                $("moneybookers_settings_secret_key").enable();
+                $("moneybookers_settings_secret_key_inherit").removeAttribute('checked');
+            }
         }
         if (status > 2) {
             $("moneybookers_multifuncbutton").style.display = "none";
         } else {
             $("moneybookers_multifuncbutton").style.display = "block";
         }
+    },
+
+    changeStore: function () {
+        if (!$("moneybookers_settings_moneybookers_email_inherit").checked) {
+            if (this.infoOrig.useDefult) {
+                $("moneybookers_settings_customer_id_inherit").click();
+                $("moneybookers_settings_customer_id").clear();
+                $("moneybookers_settings_secret_key_inherit").click();
+                $("moneybookers_settings_secret_key").clear();
+                $("moneybookers_settings_activationstatus_inherit").click();
+                this.setStatus(0);
+            }
+        }
+        else {
+            if (this.infoOrig.useDefult) {
+                $("moneybookers_settings_customer_id").setValue(this.infoOrig.customerId);
+                $("moneybookers_settings_customer_id_inherit").click();
+                $("moneybookers_settings_secret_key").setValue(this.infoOrig.key);
+                $("moneybookers_settings_secret_key_inherit").click();
+                $("moneybookers_settings_activationstatus_inherit").click();
+                this.setStatus(this.infoOrig.status);
+            }
+        }
+        this.changeUi();
+    },
+
+    isStoreView: function() {
+        return $("moneybookers_settings_moneybookers_email_inherit") != undefined;
     }
 }
diff --git a/js/mage/adminhtml/sales.js b/js/mage/adminhtml/sales.js
index 4f4b02b2fe..d9c4936463 100644
--- a/js/mage/adminhtml/sales.js
+++ b/js/mage/adminhtml/sales.js
@@ -159,7 +159,7 @@ AdminOrder.prototype = {
         else {
             this.saveData(data);
             if (name == 'country_id' || name == 'customer_address_id') {
-                this.loadArea(['shipping_method', 'billing_method', 'totals'], true, data);
+                this.loadArea(['shipping_method', 'billing_method', 'totals', 'items'], true, data);
             }
             // added for reloading of default sender and default recipient for giftmessages
             //this.loadArea(['giftmessage'], true, data);
@@ -242,7 +242,7 @@ AdminOrder.prototype = {
     resetShippingMethod : function(data){
         data['reset_shipping'] = 1;
         this.isShippingMethodReseted = true;
-        this.loadArea(['shipping_method', 'billing_method', 'shipping_address', 'totals', 'giftmessage'], true, data);
+        this.loadArea(['shipping_method', 'billing_method', 'shipping_address', 'totals', 'giftmessage', 'items'], true, data);
     },
 
     loadShippingRates : function(){
diff --git a/js/varien/js.js b/js/varien/js.js
index 43f3980c2c..cef4c462a9 100644
--- a/js/varien/js.js
+++ b/js/varien/js.js
@@ -407,7 +407,7 @@ Varien.DateElement.prototype = {
             this.month  = $(content + 'month');
             this.year   = $(content + 'year');
             this.full   = $(content + 'full');
-            this.advice = $(content + 'advice');
+            this.advice = $(content + 'date-advice');
         } else if (type == 'container') {
             // content must be container with data
             this.day    = content.day;
@@ -421,7 +421,7 @@ Varien.DateElement.prototype = {
 
         this.required = required;
         this.format   = format;
-        
+
         this.day.addClassName('validate-custom');
         this.day.validate = this.validate.bind(this);
         this.month.addClassName('validate-custom');
@@ -429,6 +429,7 @@ Varien.DateElement.prototype = {
         this.year.addClassName('validate-custom');
         this.year.validate = this.validate.bind(this);
 
+        this.setDateRange(false, false);
         this.year.setAttribute('autocomplete','off');
 
         this.advice.hide();
@@ -444,20 +445,17 @@ Varien.DateElement.prototype = {
         } else if (!day || !month || !year) {
             error = 'Please enter a valid full date.';
         } else {
-            var date = new Date, curyear = date.getFullYear(), countDaysInMonth = 0, errorType = null;
-            date.setYear(year); date.setMonth(month-1); date.setDate(32);
+            var date = new Date, countDaysInMonth = 0, errorType = null;
+            date.setYear(year);date.setMonth(month-1);date.setDate(32);
             countDaysInMonth = 32 - date.getDate();
             if(!countDaysInMonth || countDaysInMonth>31) countDaysInMonth = 31;
-             
+
             if (day<1 || day>countDaysInMonth) {
                 errorType = 'day';
                 error = 'Please enter a valid day (1-%d).';
             } else if (month<1 || month>12) {
                 errorType = 'month';
                 error = 'Please enter a valid month (1-12).';
-            } else if (year<1900 || year>curyear) {
-                errorType = 'year';
-                error = 'Please enter a valid year (1900-%d).';
             } else {
                 if(day % 10 == day) this.day.value = '0'+day;
                 if(month % 10 == month) this.month.value = '0'+month;
@@ -466,8 +464,16 @@ Varien.DateElement.prototype = {
                 var test = new Date(testFull);
                 if (isNaN(test)) {
                     error = 'Please enter a valid date.';
+                } else {
+                    this.setFullDate(test);
                 }
             }
+            var valueError = false;
+            if (!error && !this.validateData()){//(year<1900 || year>curyear) {
+                errorType = this.validateDataErrorType;//'year';
+                valueError = this.validateDataErrorText;//'Please enter a valid year (1900-%d).';
+                error = valueError;
+            }
         }
 
         if (error !== false) {
@@ -475,18 +481,40 @@ Varien.DateElement.prototype = {
                 error = Translator.translate(error);
             }
             catch (e) {}
-            this.advice.innerHTML = error.replace('%d', errorType == 'day' ? countDaysInMonth : curyear);
+            if (!valueError) {
+                this.advice.innerHTML = error.replace('%d', countDaysInMonth);
+            } else {
+                this.advice.innerHTML = this.errorTextModifier(error);
+            }
             this.advice.show();
             return false;
         }
-        
+
         // fixing elements class
         this.day.removeClassName('validation-failed');
         this.month.removeClassName('validation-failed');
         this.year.removeClassName('validation-failed');
-        
+
         this.advice.hide();
         return true;
+    },
+    validateData: function() {
+        var year = this.fullDate.getFullYear();
+        var date = new Date;
+        this.curyear = date.getFullYear();
+        return (year>=1900 && year<=this.curyear);
+    },
+    validateDataErrorType: 'year',
+    validateDataErrorText: 'Please enter a valid year (1900-%d).',
+    errorTextModifier: function(text) {
+        return text.replace('%d', this.curyear);
+    },
+    setDateRange: function(minDate, maxDate) {
+        this.minDate = minDate;
+        this.maxDate = maxDate;
+    },
+    setFullDate: function(date) {
+        this.fullDate = date;
     }
 };
 
@@ -500,17 +528,65 @@ Varien.DOB.prototype = {
         container.year      = Element.select(el, '.dob-year input')[0];
         container.full      = Element.select(el, '.dob-full input')[0];
         container.advice    = Element.select(el, '.validation-advice')[0];
-        
+
         new Varien.DateElement('container', container, required, format);
     }
 };
 
+Varien.dateRangeDate = Class.create();
+Varien.dateRangeDate.prototype = Object.extend(new Varien.DateElement(), {
+    validateData: function() {
+        var validate = true;
+        if (this.minDate || this.maxValue) {
+            if (this.minDate) {
+                this.minDate = new Date(this.minDate);
+                this.minDate.setHours(0);
+                if (isNaN(this.minDate)) {
+                    this.minDate = new Date('1/1/1900');
+                }
+                validate = validate && (this.fullDate >= this.minDate)
+            }
+            if (this.maxDate) {
+                this.maxDate = new Date(this.maxDate)
+                this.minDate.setHours(0);
+                if (isNaN(this.maxDate)) {
+                    this.maxDate = new Date();
+                }
+                validate = validate && (this.fullDate <= this.maxDate)
+            }
+            if (this.maxDate && this.minDate) {
+                this.validateDataErrorText = 'Please enter a valid date between %s and %s';
+            } else if (this.maxDate) {
+                this.validateDataErrorText = 'Please enter a valid date less than or equal to %s';
+            } else if (this.minDate) {
+                this.validateDataErrorText = 'Please enter a valid date equal to or greater than %s';
+            } else {
+                this.validateDataErrorText = '';
+            }
+        }
+        return validate;
+    },
+    validateDataErrorText: 'Date should be between %s and %s',
+    errorTextModifier: function(text) {
+        if (this.minDate) {
+            text = text.sub('%s', this.dateFormat(this.minDate));
+        }
+        if (this.maxDate) {
+            text = text.sub('%s', this.dateFormat(this.maxDate));
+        }
+        return text;
+    },
+    dateFormat: function(date) {
+        return (date.getMonth() + 1) + '/' + date.getDate() + '/' + date.getFullYear();
+    }
+});
+
 Varien.FileElement = Class.create();
 Varien.FileElement.prototype = {
     initialize: function (id) {
         this.fileElement = $(id);
         this.hiddenElement = $(id + '_value');
-        
+
         this.fileElement.observe('change', this.selectFile.bind(this));
     },
     selectFile: function(event) {
diff --git a/js/varien/product.js b/js/varien/product.js
index 98398bbf5c..2336b1e112 100644
--- a/js/varien/product.js
+++ b/js/varien/product.js
@@ -128,7 +128,7 @@ Product.Zoom.prototype = {
     scale: function (v) {
         var centerX  = (this.containerDim.width*(1-this.imageZoom)/2-this.imageX)/this.imageZoom;
         var centerY  = (this.containerDim.height*(1-this.imageZoom)/2-this.imageY)/this.imageZoom;
-        var overSize = (this.imageDim.width > this.containerDim.width && this.imageDim.height > this.containerDim.height);
+        var overSize = (this.imageDim.width > this.containerDim.width || this.imageDim.height > this.containerDim.height);
 
         this.imageZoom = this.floorZoom+(v*(this.ceilingZoom-this.floorZoom));
 
@@ -557,7 +557,7 @@ Product.OptionsPrice.prototype = {
         this.showBothPrices     = config.showBothPrices;
         this.productPrice       = config.productPrice;
         this.productOldPrice    = config.productOldPrice;
-        this.skipCalculate      = config.skipCalculate;
+        this.skipCalculate      = config.skipCalculate;//@deprecated after 1.5.1.0
         this.duplicateIdSuffix  = config.idSuffix;
         this.specialTaxPrice    = config.specialTaxPrice;
 
@@ -624,7 +624,7 @@ Product.OptionsPrice.prototype = {
         var optionOldPrice = optionPrices[2];
         var priceInclTax = optionPrices[3];
         optionPrices = optionPrices[0];
-        
+
         $H(this.containers).each(function(pair) {
             var _productPrice;
             var _plusDisposition;
@@ -673,6 +673,8 @@ Product.OptionsPrice.prototype = {
 
                 if (pair.value == 'price-including-tax-'+this.productId) {
                     price = incl;
+                } else if (pair.value == 'price-excluding-tax-'+this.productId) {
+                    price = excl;
                 } else if (pair.value == 'old-price-'+this.productId) {
                     if (this.showIncludeTax || this.showBothPrices) {
                         price = incl;
@@ -683,11 +685,7 @@ Product.OptionsPrice.prototype = {
                     if (this.showIncludeTax) {
                         price = incl;
                     } else {
-                        if (!this.skipCalculate || _productPrice == 0) {
-                            price = excl;
-                        } else {
-                            price = optionPrices+parseFloat(_productPrice);
-                        }
+                        price = excl;
                     }
                 }
 
diff --git a/lib/Varien/Data/Collection/Db.php b/lib/Varien/Data/Collection/Db.php
index 7cffb3819c..48e60253c5 100644
--- a/lib/Varien/Data/Collection/Db.php
+++ b/lib/Varien/Data/Collection/Db.php
@@ -299,7 +299,7 @@ public function unshiftOrder($field, $direction = self::SORT_ORDER_DESC)
      */
     private function _setOrder($field, $direction, $unshift = false)
     {
-        $field = $this->_getMappedField($field);
+        $field = (string)$this->_getMappedField($field);
         $direction = (strtoupper($direction) == self::SORT_ORDER_ASC) ? self::SORT_ORDER_ASC : self::SORT_ORDER_DESC;
         // emulate associative unshift
         if ($unshift) {
@@ -443,7 +443,11 @@ protected function _getConditionSql($fieldName, $condition) {
         $sql = '';
         $fieldName = $this->_getConditionFieldName($fieldName);
         if (is_array($condition) && isset($condition['field_expr'])) {
-            $fieldName = str_replace('#?', $this->getConnection()->quoteIdentifier($fieldName), $condition['field_expr']);
+            $fieldName = str_replace(
+                '#?',
+                $this->getConnection()->quoteIdentifier($fieldName),
+                $condition['field_expr']
+            );
         }
         if (is_array($condition)) {
             if (isset($condition['from']) || isset($condition['to'])) {
diff --git a/lib/Varien/Data/Form/Element/Abstract.php b/lib/Varien/Data/Form/Element/Abstract.php
index e12615de83..344d0802b2 100644
--- a/lib/Varien/Data/Form/Element/Abstract.php
+++ b/lib/Varien/Data/Form/Element/Abstract.php
@@ -275,4 +275,34 @@ public function getHtmlContainerId()
         }
         return '';
     }
+
+    /**
+     * Add specified values to element values
+     *
+     * @param string|int|array $values
+     * @param bool $overwrite
+     * @return Varien_Data_Form_Element_Abstract
+     */
+    public function addElementValues($values, $overwrite = false)
+    {
+        if (empty($values) || (is_string($values) && trim($values) == '')) {
+            return $this;
+        }
+        if (!is_array($values)) {
+            $values = Mage::helper('core')->escapeHtml(trim($values));
+            $values = array($values => $values);
+        }
+        $elementValues = $this->getValues();
+        if (!empty($elementValues)) {
+            foreach ($values as $key => $value) {
+                if ((isset($elementValues[$key]) && $overwrite) || !isset($elementValues[$key])) {
+                    $elementValues[$key] = Mage::helper('core')->escapeHtml($value);
+                }
+            }
+            $values = $elementValues;
+        }
+        $this->setValues($values);
+
+        return $this;
+    }
 }
diff --git a/lib/Varien/Data/Form/Element/Collection.php b/lib/Varien/Data/Form/Element/Collection.php
index f3f2af3594..fcf964b15d 100644
--- a/lib/Varien/Data/Form/Element/Collection.php
+++ b/lib/Varien/Data/Form/Element/Collection.php
@@ -139,7 +139,7 @@ public function add(Varien_Data_Form_Element_Abstract $element, $after=false)
                 if ($currElement->getId() == $after) {
                     $newOrderElements[] = $currElement;
                     $newOrderElements[] = $element;
-                    $this->_elements = array_merge($newOrderElements, array_slice($this->_elements, $index+1));
+                    $this->_elements = array_merge($newOrderElements, array_slice($this->_elements, $index + 1));
                     return $element;
                 }
                 $newOrderElements[] = $currElement;
@@ -175,6 +175,8 @@ public function remove($elementId)
                 unset($this->_elements[$index]);
             }
         }
+        // Renumber elements for further correct adding and removing other elements
+        $this->_elements = array_merge($this->_elements, array());
         return $this;
     }
 
diff --git a/lib/Varien/Data/Form/Element/Editor.php b/lib/Varien/Data/Form/Element/Editor.php
index dfef0d498a..ecf6dbf95c 100644
--- a/lib/Varien/Data/Form/Element/Editor.php
+++ b/lib/Varien/Data/Form/Element/Editor.php
@@ -75,45 +75,61 @@ public function getElementHtml()
         if($this->isEnabled())
         {
             // add Firebug notice translations
+            $warn = 'Firebug is known to make the WYSIWYG editor slow unless it is turned off or configured properly.';
             $this->getConfig()->addData(array(
                 'firebug_warning_title'  => $this->translate('Warning'),
-                'firebug_warning_text'   => $this->translate('Firebug is known to make the WYSIWYG editor slow unless it is turned off or configured properly.'),
+                'firebug_warning_text'   => $this->translate($warn),
                 'firebug_warning_anchor' => $this->translate('Hide'),
             ));
 
             $translatedString = array(
                 'Insert Image...' => $this->translate('Insert Image...'),
                 'Insert Media...' => $this->translate('Insert Media...'),
-                'Insert File...' => $this->translate('Insert File...')
+                'Insert File...'  => $this->translate('Insert File...')
             );
 
             $jsSetupObject = 'wysiwyg' . $this->getHtmlId();
 
-            $html = $this->_getButtonsHtml()
-                .'<textarea name="'.$this->getName().'" title="'.$this->getTitle().'" id="'.$this->getHtmlId().'" class="textarea '.$this->getClass().'" '.$this->serialize($this->getHtmlAttributes()).' >'.$this->getEscapedValue().'</textarea>
-
-                '.$js.'
+            $forceLoad = '';
+            if (!$this->isHidden()) {
+                if ($this->getForceLoad()) {
+                    $forceLoad = $jsSetupObject . '.setup("exact");';
+                } else {
+                    $forceLoad = 'Event.observe(window, "load", '
+                                . $jsSetupObject . '.setup.bind(' . $jsSetupObject . ', "exact"));';
+                }
+            }
 
+            $html = $this->_getButtonsHtml()
+                . '<textarea name="' . $this->getName() . '" title="' . $this->getTitle()
+                . '" id="' . $this->getHtmlId() . '"'
+                . ' class="textarea ' . $this->getClass() . '" '
+                . $this->serialize($this->getHtmlAttributes()) . ' >' . $this->getEscapedValue() . '</textarea>'
+                . $js . '
                 <script type="text/javascript">
                 //<![CDATA[
                     if ("undefined" != typeof(Translator)) {
                         Translator.add(' . Zend_Json::encode($translatedString) . ');
-                    }
-                    '.$jsSetupObject.' = new tinyMceWysiwygSetup("'.$this->getHtmlId().'", '.Zend_Json::encode($this->getConfig()).');
-
-                    '.($this->isHidden() ? '' : ($this->getForceLoad()?$jsSetupObject.'.setup("exact");':'Event.observe(window, "load", '.$jsSetupObject.'.setup.bind('.$jsSetupObject.', "exact"));')).'
-                    editorFormValidationHandler = '.$jsSetupObject.'.onFormValidation.bind('.$jsSetupObject.');
-                    Event.observe("toggle'.$this->getHtmlId().'", "click", '.$jsSetupObject.'.toggle.bind('.$jsSetupObject.'));
+                    }'
+                    . $jsSetupObject . ' = new tinyMceWysiwygSetup("' . $this->getHtmlId() . '", '
+                    . Zend_Json::encode($this->getConfig()).');'
+                    . $forceLoad.'
+                    editorFormValidationHandler = ' . $jsSetupObject . '.onFormValidation.bind(' . $jsSetupObject . ');
+                    Event.observe("toggle' . $this->getHtmlId() . '", "click", '
+                        . $jsSetupObject . '.toggle.bind('.$jsSetupObject.'));
                     varienGlobalEvents.attachEventHandler("formSubmit", editorFormValidationHandler);
-                    varienGlobalEvents.attachEventHandler("tinymceBeforeSetContent", '.$jsSetupObject.'.beforeSetContent.bind('.$jsSetupObject.'));
-                    varienGlobalEvents.attachEventHandler("tinymceSaveContent", '.$jsSetupObject.'.saveContent.bind('.$jsSetupObject.'));
+                    varienGlobalEvents.attachEventHandler("tinymceBeforeSetContent", '
+                        . $jsSetupObject . '.beforeSetContent.bind(' . $jsSetupObject . '));
+                    varienGlobalEvents.attachEventHandler("tinymceSaveContent", '
+                        . $jsSetupObject . '.saveContent.bind(' . $jsSetupObject . '));
                     varienGlobalEvents.clearEventHandlers("open_browser_callback");
-                    varienGlobalEvents.attachEventHandler("open_browser_callback", '.$jsSetupObject.'.openFileBrowser.bind('.$jsSetupObject.'));
+                    varienGlobalEvents.attachEventHandler("open_browser_callback", '
+                        . $jsSetupObject . '.openFileBrowser.bind(' . $jsSetupObject . '));
                 //]]>
                 </script>';
 
             $html = $this->_wrapIntoContainer($html);
-            $html.= $this->getAfterElementHtml();
+            $html .= $this->getAfterElementHtml();
             return $html;
         } else {
             // Display only buttons to additional features
@@ -183,23 +199,28 @@ protected function _getPluginButtonsHtml($visible = true)
         if ($this->getConfig('add_widgets')) {
             $buttonsHtml .= $this->_getButtonHtml(array(
                 'title'     => $this->translate('Insert Widget...'),
-                'onclick'   => "widgetTools.openDialog('" . $this->getConfig('widget_window_url') . "widget_target_id/" . $this->getHtmlId() . "')",
+                'onclick'   => "widgetTools.openDialog('" . $this->getConfig('widget_window_url') . "widget_target_id "
+                               . $this->getHtmlId() . "')",
                 'class'     => 'add-widget plugin',
                 'style'     => $visible ? '' : 'display:none',
             ));
         }
 
         // Button to media images insertion window
-        $buttonsHtml .= $this->_getButtonHtml(array(
-            'title'     => $this->translate('Insert Image...'),
-            'onclick'   => "MediabrowserUtility.openDialog('" .
-                           $this->getConfig('files_browser_window_url') .
-                           "target_element_id/" . $this->getHtmlId() . "/" .
-                           ((null !== $this->getConfig('store_id')) ? ('store/' . $this->getConfig('store_id') . '/') : '') .
-                           "')",
+        if ($this->getConfig('add_images')) {
+            $buttonsHtml .= $this->_getButtonHtml(array(
+                'title'     => $this->translate('Insert Image...'),
+                'onclick'   => "MediabrowserUtility.openDialog('" .
+                               $this->getConfig('files_browser_window_url') .
+                               "target_element_id/" . $this->getHtmlId() . "/" .
+                                ((null !== $this->getConfig('store_id'))
+                                    ? ('store/' . $this->getConfig('store_id') . '/')
+                                    : '')
+                               . "')",
             'class'     => 'add-image plugin',
             'style'     => $visible ? '' : 'display:none',
         ));
+        }
 
         foreach ($this->getConfig('plugins') as $plugin) {
             if (isset($plugin['options']) && $this->_checkPluginButtonOptions($plugin['options'])) {
diff --git a/lib/Varien/Data/Form/Element/Multiline.php b/lib/Varien/Data/Form/Element/Multiline.php
index e0289bad68..165d2e0e59 100644
--- a/lib/Varien/Data/Form/Element/Multiline.php
+++ b/lib/Varien/Data/Form/Element/Multiline.php
@@ -48,24 +48,29 @@ public function getLabelHtml($suffix = 0)
         return parent::getLabelHtml($suffix);
     }
 
+    /**
+     * Get element HTML
+     *
+     * @return string
+     */
     public function getElementHtml()
     {
         $html = '';
         $lineCount = $this->getLineCount();
 
-        for ($i=0; $i<$lineCount; $i++){
-            if ($i==0 && $this->getRequired()){
+        for ($i = 0; $i < $lineCount; $i++) {
+            if ($i == 0 && $this->getRequired()) {
                 $this->setClass('input-text required-entry');
-            }
-            else {
+            } else {
                 $this->setClass('input-text');
             }
-            $html.= '<div class="multi-input"><input id="'.$this->getHtmlId().$i.'" name="'.$this->getName().'['.$i.']'
-                .'" value="'.$this->getEscapedValue($i).'"'.$this->serialize($this->getHtmlAttributes()).' />'."\n";
+            $html .= '<div class="multi-input"><input id="' . $this->getHtmlId() . $i . '" name="' . $this->getName()
+                . '[' . $i . ']' . '" value="' . $this->getEscapedValue($i) . '" '
+                . $this->serialize($this->getHtmlAttributes()) . ' />' . "\n";
             if ($i==0) {
-                $html.= $this->getAfterElementHtml();
+                $html .= $this->getAfterElementHtml();
             }
-            $html.= '</div>';
+            $html .= '</div>';
         }
         return $html;
     }
diff --git a/lib/Varien/Data/Form/Element/Multiselect.php b/lib/Varien/Data/Form/Element/Multiselect.php
index 5f337f5e52..e3a434323a 100644
--- a/lib/Varien/Data/Form/Element/Multiselect.php
+++ b/lib/Varien/Data/Form/Element/Multiselect.php
@@ -54,10 +54,11 @@ public function getElementHtml()
     {
         $this->addClass('select multiselect');
         $html = '';
-        if ($this->getCanBeEmpty()) {
+        if ($this->getCanBeEmpty() && empty($this->_data['disabled'])) {
             $html .= '<input type="hidden" name="' . parent::getName() . '" value="" />';
         }
-        $html .= '<select id="'.$this->getHtmlId().'" name="'.$this->getName().'" '.$this->serialize($this->getHtmlAttributes()).' multiple="multiple">'."\n";
+        $html .= '<select id="' . $this->getHtmlId() . '" name="' . $this->getName() . '" ' .
+            $this->serialize($this->getHtmlAttributes()) . ' multiple="multiple">' . "\n";
 
         $value = $this->getValue();
         if (!is_array($value)) {
@@ -67,20 +68,21 @@ public function getElementHtml()
         if ($values = $this->getValues()) {
             foreach ($values as $option) {
                 if (is_array($option['value'])) {
-                    $html.='<optgroup label="'.$option['label'].'">'."\n";
+                    $html .= '<optgroup label="' . $option['label'] . '">' . "\n";
                     foreach ($option['value'] as $groupItem) {
-                        $html.= $this->_optionToHtml($groupItem, $value);
+                        $html .= $this->_optionToHtml($groupItem, $value);
                     }
-                    $html.='</optgroup>'."\n";
+                    $html .= '</optgroup>' . "\n";
                 }
                 else {
-                    $html.= $this->_optionToHtml($option, $value);
+                    $html .= $this->_optionToHtml($option, $value);
                 }
             }
         }
 
-        $html.= '</select>'."\n";
-        $html.= $this->getAfterElementHtml();
+        $html .= '</select>' . "\n";
+        $html .= $this->getAfterElementHtml();
+
         return $html;
     }
 
@@ -97,8 +99,10 @@ public function getDefaultHtml()
 
 
         if($this->getSelectAll() && $this->getDeselectAll()) {
-            $result.= '<a href="#" onclick="return ' . $this->getJsObjectName() . '.selectAll()">' . $this->getSelectAll() . '</a> <span class="separator">&nbsp;|&nbsp;</span>';
-            $result.= '<a href="#" onclick="return ' . $this->getJsObjectName() . '.deselectAll()">' . $this->getDeselectAll() . '</a>';
+            $result .= '<a href="#" onclick="return ' . $this->getJsObjectName() . '.selectAll()">' .
+                $this->getSelectAll() . '</a> <span class="separator">&nbsp;|&nbsp;</span>';
+            $result .= '<a href="#" onclick="return ' . $this->getJsObjectName() . '.deselectAll()">' .
+                $this->getDeselectAll() . '</a>';
         }
 
         $result.= ( $this->getNoSpan() === true ) ? '' : '</span>'."\n";
@@ -121,7 +125,7 @@ public function getDefaultHtml()
         $result.= '         return false; ' . "\n";
         $result.= '     }' . "\n";
         $result.= '  }' . "\n";
-        $result.= "\n</script>";
+        $result.= "\n" . '</script>';
 
         return $result;
     }
@@ -141,4 +145,4 @@ protected function _optionToHtml($option, $selected)
         $html.= '>'.$this->_escape($option['label']). '</option>'."\n";
         return $html;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Db/Adapter/Mysqli.php b/lib/Varien/Db/Adapter/Mysqli.php
index f0bd277d97..6024903ace 100644
--- a/lib/Varien/Db/Adapter/Mysqli.php
+++ b/lib/Varien/Db/Adapter/Mysqli.php
@@ -52,28 +52,28 @@ protected function _connect()
         }
 
         $conn->init();
-	    $conn->options(MYSQLI_OPT_LOCAL_INFILE, true);
-	    #$conn->options(MYSQLI_CLIENT_MULTI_QUERIES, true);
-
-	    $port = !empty($this->_config['port']) ? $this->_config['port'] : null;
-	    $socket = !empty($this->_config['unix_socket']) ? $this->_config['unix_socket'] : null;
-	    // socket specified in host config
-	    if (strpos($this->_config['host'], '/')!==false) {
-	        $socket = $this->_config['host'];
-	        $this->_config['host'] = null;
-	    } elseif (strpos($this->_config['host'], ':')!==false) {
-	        list($this->_config['host'], $port) = explode(':', $this->_config['host']);
-	    }
+        $conn->options(MYSQLI_OPT_LOCAL_INFILE, true);
+        #$conn->options(MYSQLI_CLIENT_MULTI_QUERIES, true);
+
+        $port = !empty($this->_config['port']) ? $this->_config['port'] : null;
+        $socket = !empty($this->_config['unix_socket']) ? $this->_config['unix_socket'] : null;
+        // socket specified in host config
+        if (strpos($this->_config['host'], '/')!==false) {
+            $socket = $this->_config['host'];
+            $this->_config['host'] = null;
+        } elseif (strpos($this->_config['host'], ':')!==false) {
+            list($this->_config['host'], $port) = explode(':', $this->_config['host']);
+        }
 
 #echo "<pre>".print_r($this->_config,1)."</pre>"; die;
-		@$conn->real_connect(
-		    $this->_config['host'],
-		    $this->_config['username'],
-		    $this->_config['password'],
-		    $this->_config['dbname'],
-		    $port,
-		    $socket
-		);
+        @$conn->real_connect(
+            $this->_config['host'],
+            $this->_config['username'],
+            $this->_config['password'],
+            $this->_config['dbname'],
+            $port,
+            $socket
+        );
         if (mysqli_connect_errno()) {
             throw new Zend_Db_Adapter_Mysqli_Exception(mysqli_connect_error());
         }
@@ -84,25 +84,31 @@ protected function _connect()
         $this->_connection->query("SET SQL_MODE=''");
     }
 
+    /**
+     * Run RAW Query
+     *
+     * @param string $sql
+     * @return Zend_Db_Statement_Interface
+     */
     public function raw_query($sql)
     {
-    	do {
-    		$retry = false;
-    		$tries = 0;
-	    	try {
-    		    $this->clear_result();
-	        	$result = $this->getConnection()->query($sql);
-	        	$this->clear_result();
-	    	}
-	    	catch (Exception $e) {
-	    		if ($e->getMessage()=='SQLSTATE[HY000]: General error: 1205 Lock wait timeout exceeded; try restarting transaction') {
-	    			$retry = true;
-	    		} else {
-	    			throw $e;
-	    		}
-	    		$tries++;
-	    	}
-    	} while ($retry && $tries<10);
+        $timeoutMessage = 'SQLSTATE[HY000]: General error: 1205 Lock wait timeout exceeded; try restarting transaction';
+        $tries = 0;
+        do {
+            $retry = false;
+            try {
+                $this->clear_result();
+                $result = $this->getConnection()->query($sql);
+                $this->clear_result();
+            } catch (Exception $e) {
+                if ($tries < 10 && $e->getMessage() == $timeoutMessage) {
+                    $retry = true;
+                    $tries++;
+                } else {
+                    throw $e;
+                }
+            }
+        } while ($retry);
 
         return $result;
     }
@@ -142,56 +148,55 @@ public function raw_fetchRow($sql, $field=null)
     }
 
     public function multi_query($sql)
-	{
-	    $this->beginTransaction();
-	    try {
-		    $this->clear_result();
-			if ($this->getConnection()->multi_query($sql)) {
+    {
+        $this->beginTransaction();
+        try {
+            $this->clear_result();
+            if ($this->getConnection()->multi_query($sql)) {
                 $this->clear_result();
-		        $this->commit();
-			} else {
-				throw new Zend_Db_Adapter_Mysqli_Exception('multi_query: '.$this->getConnection()->error);
-			}
-	    } catch (Exception $e) {
-			$this->rollback();
-			throw $e;
-	    }
-
-		return true;
-	}
-
-	public function clear_result()
-	{
-		while ($this->getConnection()->next_result()) {
-		    if ($result = $this->getConnection()->store_result()) {
-		    	$result->free_result();
-		    }
-		    elseif($this->getConnection()->error) {
-		        throw new Zend_Db_Adapter_Mysqli_Exception('clear_result: '.$this->getConnection()->error);
-		    }
-		}
-
-	}
-
-	public function dropForeignKey($table, $fk)
-	{
+                $this->commit();
+            } else {
+                throw new Zend_Db_Adapter_Mysqli_Exception('multi_query: '.$this->getConnection()->error);
+            }
+        } catch (Exception $e) {
+            $this->rollback();
+            throw $e;
+        }
+
+        return true;
+    }
+
+    public function clear_result()
+    {
+        while ($this->getConnection()->next_result()) {
+            if ($result = $this->getConnection()->store_result()) {
+                $result->free_result();
+            } elseif($this->getConnection()->error) {
+                throw new Zend_Db_Adapter_Mysqli_Exception('clear_result: '.$this->getConnection()->error);
+            }
+        }
+
+    }
+
+    public function dropForeignKey($table, $fk)
+    {
         $create = $this->raw_fetchRow("show create table `$table`", 'Create Table');
         if (strpos($create, "CONSTRAINT `$fk` FOREIGN KEY (")!==false) {
             return $this->raw_query("ALTER TABLE `$table` DROP FOREIGN KEY `$fk`");
         }
         return true;
-	}
+    }
 
-	public function dropKey($table, $key)
-	{
-	    $create = $this->raw_fetchRow("show create table `$table`", 'Create Table');
+    public function dropKey($table, $key)
+    {
+        $create = $this->raw_fetchRow("show create table `$table`", 'Create Table');
         if (strpos($create, "KEY `$key` (")!==false) {
             return $this->raw_query("ALTER TABLE `$table` DROP KEY `$key`");
         }
         return true;
-	}
-	
-	/**
+    }
+
+    /**
      * ADD CONSTRAINT
      *
      *
@@ -203,7 +208,8 @@ public function dropKey($table, $key)
      * @param string $onUpdate
      * @param string $onDelete
      */
-    public function addConstraint($fkName, $tableName, $keyName, $refTableName, $refKeyName, $onDelete = 'cascade', $onUpdate = 'cascade')
+    public function addConstraint($fkName, $tableName, $keyName, $refTableName,
+        $refKeyName, $onDelete = 'cascade', $onUpdate = 'cascade')
     {
         if (substr($fkName, 0, 3) != 'FK_') {
             $fkName = 'FK_' . $fkName;
@@ -274,4 +280,4 @@ public function select()
     {
         return new Varien_Db_Select($this);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Varien/Db/Adapter/Pdo/Mysql.php b/lib/Varien/Db/Adapter/Pdo/Mysql.php
index 0151843b5b..1ea5cd2d05 100644
--- a/lib/Varien/Db/Adapter/Pdo/Mysql.php
+++ b/lib/Varien/Db/Adapter/Pdo/Mysql.php
@@ -269,20 +269,21 @@ protected function _connect()
      */
     public function raw_query($sql)
     {
+        $lostConnectionMessage = 'SQLSTATE[HY000]: General error: 2013 Lost connection to MySQL server during query';
         $tries = 0;
         do {
             $retry = false;
             try {
                 $result = $this->getConnection()->query($sql);
             } catch (PDOException $e) {
-                if ($e->getMessage()=='SQLSTATE[HY000]: General error: 2013 Lost connection to MySQL server during query') {
+                if ($tries < 10 && $e->getMessage() == $lostConnectionMessage) {
                     $retry = true;
+                    $tries++;
                 } else {
                     throw $e;
                 }
-                $tries++;
             }
-        } while ($retry && $tries<10);
+        } while ($retry);
 
         return $result;
     }
@@ -325,7 +326,10 @@ public function query($sql, $bind = array())
             $sql = (string)$sql;
             if (strpos($sql, ':') !== false || strpos($sql, '?') !== false) {
                 $this->_bindParams = $bind;
-                $sql = preg_replace_callback('#(([\'"])((\\2)|((.*?[^\\\\])\\2)))#', array($this, 'proccessBindCallback'), $sql);
+                $sql = preg_replace_callback('#(([\'"])((\\2)|((.*?[^\\\\])\\2)))#',
+                    array($this, 'proccessBindCallback'),
+                    $sql
+                );
                 Varien_Exception::processPcreError();
                 $bind = $this->_bindParams;
             }
@@ -415,7 +419,11 @@ public function multi_query($sql)
      */
     protected function _splitMultiQuery($sql)
     {
-        $parts = preg_split('#(;|\'|"|\\\\|//|--|\n|/\*|\*/)#', $sql, null, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+        $parts = preg_split('#(;|\'|"|\\\\|//|--|\n|/\*|\*/)#',
+            $sql,
+            null,
+            PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE
+        );
 
         $q = false;
         $c = false;
@@ -1366,15 +1374,14 @@ public function changeTableEngine($tableName, $engine, $schemaName = null)
      *
      * @param mixed $table The table to insert data into.
      * @param array $data Column-value pairs or array of column-value pairs.
-     * @param arrat $fields update fields pairs or values
+     * @param array $fields update fields pairs or values
      * @return int The number of affected rows.
      */
     public function insertOnDuplicate($table, array $data, array $fields = array())
     {
         // extract and quote col names from the array keys
-        $row    = reset($data); // get first elemnt from data array
+        $row    = reset($data); // get first element from data array
         $bind   = array(); // SQL bind array
-        $cols   = array();
         $values = array();
 
         if (is_array($row)) { // Array of column-value pairs
diff --git a/lib/Varien/File/Uploader.php b/lib/Varien/File/Uploader.php
index 102bed0f46..8b902e6289 100644
--- a/lib/Varien/File/Uploader.php
+++ b/lib/Varien/File/Uploader.php
@@ -27,9 +27,12 @@
 /**
  * File upload class
  *
+ * ATTENTION! This class must be used like abstract class and must added
+ * validation by protected file extension list to extended class
+ *
  * @category   Varien
  * @package    Varien_File
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author     Magento Core Team <core@magentocommerce.com>
  */
 
 class Varien_File_Uploader
@@ -133,6 +136,14 @@ class Varien_File_Uploader
     const MULTIPLE_STYLE = 1;
     const TMP_NAME_EMPTY = 666;
 
+    /**
+     * Resulting of uploaded file
+     *
+     * @var array|bool      Array with file info keys: path, file. Result is
+     *                      FALSE when file not uploaded
+     */
+    protected $_result;
+
     function __construct($fileId)
     {
         $this->_setUploadFileId($fileId);
@@ -164,53 +175,54 @@ protected function _afterSave($result)
      * @access public
      * @return void|bool
      */
-    public function save($destinationFolder, $newFileName=null)
+    public function save($destinationFolder, $newFileName = null)
     {
         $this->_validateFile();
 
-        if( $this->_allowCreateFolders ) {
+        if ($this->_allowCreateFolders) {
             $this->_createDestinationFolder($destinationFolder);
         }
 
-        if( !is_writable($destinationFolder) ) {
+        if (!is_writable($destinationFolder)) {
             throw new Exception('Destination folder is not writable or does not exists.');
         }
 
-        $result = false;
+        $this->_result = false;
 
-        $destFile = $destinationFolder;
-        $fileName = ( isset($newFileName) ) ? $newFileName : self::getCorrectFileName($this->_file['name']);
-        if( $this->_enableFilesDispersion ) {
+        $destinationFile = $destinationFolder;
+        $fileName = isset($newFileName) ? $newFileName : self::getCorrectFileName($this->_file['name']);
+        if ($this->_enableFilesDispersion) {
             $fileName = $this->correctFileNameCase($fileName);
             $this->setAllowCreateFolders(true);
             $this->_dispretionPath = self::getDispretionPath($fileName);
-            $destFile.= $this->_dispretionPath;
-            $this->_createDestinationFolder($destFile);
+            $destinationFile.= $this->_dispretionPath;
+            $this->_createDestinationFolder($destinationFile);
         }
 
-        if( $this->_allowRenameFiles ) {
-            $fileName = self::getNewFileName(self::_addDirSeparator($destFile).$fileName);
+        if ($this->_allowRenameFiles) {
+            $fileName = self::getNewFileName(self::_addDirSeparator($destinationFile) . $fileName);
         }
 
-        $destFile = self::_addDirSeparator($destFile) . $fileName;
+        $destinationFile = self::_addDirSeparator($destinationFile) . $fileName;
 
-        $result = move_uploaded_file($this->_file['tmp_name'], $destFile);
+        $this->_result = move_uploaded_file($this->_file['tmp_name'], $destinationFile);
 
-        if( $result ) {
-            chmod($destFile, 0777);
-            if ( $this->_enableFilesDispersion ) {
-                $fileName = str_replace(DIRECTORY_SEPARATOR, '/', self::_addDirSeparator($this->_dispretionPath)) . $fileName;
+        if ($this->_result) {
+            chmod($destinationFile, 0777);
+            if ($this->_enableFilesDispersion) {
+                $fileName = str_replace(DIRECTORY_SEPARATOR, '/',
+                    self::_addDirSeparator($this->_dispretionPath)) . $fileName;
             }
             $this->_uploadedFileName = $fileName;
             $this->_uploadedFileDir = $destinationFolder;
-            $result = $this->_file;
-            $result['path'] = $destinationFolder;
-            $result['file'] = $fileName;
+            $this->_result = $this->_file;
+            $this->_result['path'] = $destinationFolder;
+            $this->_result['file'] = $fileName;
 
-            $this->_afterSave($result);
+            $this->_afterSave($this->_result);
         }
 
-        return $result;
+        return $this->_result;
     }
 
     /**
@@ -229,12 +241,11 @@ protected function _validateFile()
 
         //is file extension allowed
         $fileExtension = substr($fileName, strrpos($fileName, '.')+1);
-        if( !$this->chechAllowedExtension($fileExtension) ) {
+        if (!$this->checkAllowedExtension($fileExtension)) {
             throw new Exception('Disallowed file type.');
         }
         //run validate callbacks
-        foreach ($this->_validateCallbacks as $params)
-        {
+        foreach ($this->_validateCallbacks as $params) {
             if (is_object($params['object']) && method_exists($params['object'], $params['method'])) {
                 $params['object']->$params['method']($filePath);
             }
@@ -246,8 +257,8 @@ protected function _validateFile()
      *
      * @param string $callbackName
      * @param object $callbackObject
-     * @param string $callbackMethod - method name of $callbackObject. It must have interface (string $tmpFilePath)
-     * @access public
+     * @param string $callbackMethod    Method name of $callbackObject. It must
+     *                                  have interface (string $tmpFilePath)
      * @return Varien_File_Uploader
      */
     public function addValidateCallback($callbackName, $callbackObject, $callbackMethod)
@@ -322,8 +333,8 @@ static protected function _addDirSeparator($dir)
      */
     public function checkMimeType($validTypes=Array())
     {
-        if( count($validTypes) > 0 ) {
-            if( !in_array($this->_getMimeType(), $validTypes) ) {
+        if (count($validTypes) > 0) {
+            if (!in_array($this->_getMimeType(), $validTypes)) {
                 return false;
             }
         }
@@ -392,7 +403,7 @@ public function setFilenamesCaseSensitivity($flag)
         return $this;
     }
 
-    public function setAllowedExtensions($extensions=array())
+    public function setAllowedExtensions($extensions = array())
     {
         foreach ((array)$extensions as $extension) {
             $this->_allowedExtensions[] = strtolower($extension);
@@ -400,15 +411,30 @@ public function setAllowedExtensions($extensions=array())
         return $this;
     }
 
-    public function chechAllowedExtension($extension)
+    /**
+     * Check if specified extension is allowed
+     *
+     * @param string $extension
+     * @return boolean
+     */
+    public function checkAllowedExtension($extension)
     {
-        if (is_null($this->_allowedExtensions)) {
-            return true;
-        }
-        elseif (in_array(strtolower($extension), $this->_allowedExtensions)) {
+        if (!is_array($this->_allowedExtensions) || empty($this->_allowedExtensions)) {
             return true;
         }
-        return false;
+
+        return in_array(strtolower($extension), $this->_allowedExtensions);
+    }
+
+    /**
+     * @deprecated after 1.5.0.0-beta2
+     *
+     * @param string $extension
+     * @return boolean
+     */
+    public function chechAllowedExtension($extension)
+    {
+        return $this->checkAllowedExtension($extension);
     }
 
     private function _getMimeType()
@@ -428,14 +454,14 @@ private function _setUploadFileId($fileId)
         } else {
             preg_match("/^(.*?)\[(.*?)\]$/", $fileId, $file);
 
-            if( count($file) > 0 && (count($file[0]) > 0) && (count($file[1]) > 0) ) {
+            if (count($file) > 0 && (count($file[0]) > 0) && (count($file[1]) > 0)) {
                 array_shift($file);
                 $this->_uploadType = self::MULTIPLE_STYLE;
 
                 $fileAttributes = $_FILES[$file[0]];
                 $tmp_var = array();
 
-                foreach( $fileAttributes as $attributeName => $attributeValue ) {
+                foreach ($fileAttributes as $attributeName => $attributeValue) {
                     $tmp_var[$attributeName] = $attributeValue[$file[1]];
                 }
 
@@ -452,7 +478,7 @@ private function _setUploadFileId($fileId)
 
     private function _createDestinationFolder($destinationFolder)
     {
-        if( !$destinationFolder ) {
+        if (!$destinationFolder) {
             return $this;
         }
 
@@ -469,20 +495,20 @@ private function _createDestinationFolder($destinationFolder)
         $path = explode(DIRECTORY_SEPARATOR, $destinationFolder);
         $newPath = null;
         $oldPath = null;
-        foreach( $path as $key => $directory ) {
-            if (trim($directory)=='') {
+        foreach ($path as $key => $directory) {
+            if (trim($directory) == '') {
                 continue;
             }
-            if (strlen($directory)===2 && $directory{1}===':') {
+            if (strlen($directory) === 2 && $directory{1} === ':') {
                 $newPath = $directory;
                 continue;
             }
-            $newPath.= ( $newPath != DIRECTORY_SEPARATOR ) ? DIRECTORY_SEPARATOR . $directory : $directory;
-            if( is_dir($newPath) ) {
+            $newPath .= ($newPath != DIRECTORY_SEPARATOR) ? DIRECTORY_SEPARATOR . $directory : $directory;
+            if(is_dir($newPath)) {
                 $oldPath = $newPath;
                 continue;
             } else {
-                if( is_writable($oldPath) ) {
+                if(is_writable($oldPath)) {
                     mkdir($newPath, 0777);
                 } else {
                     throw new Exception("Unable to create directory '{$newPath}'. Access forbidden.");
@@ -496,7 +522,7 @@ private function _createDestinationFolder($destinationFolder)
     static public function getNewFileName($destFile)
     {
         $fileInfo = pathinfo($destFile);
-        if( file_exists($destFile) ) {
+        if (file_exists($destFile)) {
             $index = 1;
             $baseName = $fileInfo['filename'] . '.' . $fileInfo['extension'];
             while( file_exists($fileInfo['dirname'] . DIRECTORY_SEPARATOR . $baseName) ) {
@@ -515,12 +541,13 @@ static public function getDispretionPath($fileName)
     {
         $char = 0;
         $dispretionPath = '';
-        while( ($char < 2) && ($char < strlen($fileName)) ) {
+        while (($char < 2) && ($char < strlen($fileName))) {
             if (empty($dispretionPath)) {
-                $dispretionPath = DIRECTORY_SEPARATOR.('.' == $fileName[$char] ? '_' : $fileName[$char]);
-            }
-            else {
-                $dispretionPath = self::_addDirSeparator($dispretionPath) . ('.' == $fileName[$char] ? '_' : $fileName[$char]);
+                $dispretionPath = DIRECTORY_SEPARATOR
+                    . ('.' == $fileName[$char] ? '_' : $fileName[$char]);
+            } else {
+                $dispretionPath = self::_addDirSeparator($dispretionPath)
+                      . ('.' == $fileName[$char] ? '_' : $fileName[$char]);
             }
             $char ++;
         }
diff --git a/media/.htaccess b/media/.htaccess
index d79b114d13..5c5cc71bac 100644
--- a/media/.htaccess
+++ b/media/.htaccess
@@ -5,3 +5,21 @@ php_flag engine 0
 
 AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi
 Options -ExecCGI
+
+<IfModule mod_rewrite.c>
+
+############################################
+## enable rewrites
+
+    Options +FollowSymLinks
+    RewriteEngine on
+
+############################################
+## never rewrite for existing files
+    RewriteCond %{REQUEST_FILENAME} !-f
+
+############################################
+## rewrite everything else to index.php
+
+    RewriteRule .* ../get.php [L]
+</IfModule>
diff --git a/media/customer/.htaccess b/media/customer/.htaccess
deleted file mode 100644
index 93169e4eb4..0000000000
--- a/media/customer/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-Order deny,allow
-Deny from all
diff --git a/media/xmlconnect/custom/ok.gif b/media/xmlconnect/custom/ok.gif
new file mode 100644
index 0000000000..7b67a6dde7
Binary files /dev/null and b/media/xmlconnect/custom/ok.gif differ
diff --git a/media/xmlconnect/original/ok.gif b/media/xmlconnect/original/ok.gif
new file mode 100644
index 0000000000..7b67a6dde7
Binary files /dev/null and b/media/xmlconnect/original/ok.gif differ
diff --git a/media/xmlconnect/system/ok.gif b/media/xmlconnect/system/ok.gif
new file mode 100644
index 0000000000..7b67a6dde7
Binary files /dev/null and b/media/xmlconnect/system/ok.gif differ
diff --git a/media/xmlconnect/themes/test_black.xml b/media/xmlconnect/themes/test_black.xml
new file mode 100644
index 0000000000..265fa5eb1e
--- /dev/null
+++ b/media/xmlconnect/themes/test_black.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<theme>
+    <manifest>
+        <name>test_white</name>
+        <label>(Testing) Plain Black</label>
+        <version>1.0</version>
+        <requires>1.4.0.2</requires>
+    </manifest>
+    <configuration>
+        <native>
+            <navigationBar>
+                <tintColor>#000000</tintColor>
+            </navigationBar>
+            <body>
+                <primaryColor>#000000</primaryColor>
+                <secondaryColor>#000000</secondaryColor>
+                <backgroundColor>#000000</backgroundColor>
+                <scrollBackgroundColor>#000000</scrollBackgroundColor>
+            </body>
+            <categoryItem>
+                <tintColor>#000000</tintColor>
+                <backgroundColor>#000000</backgroundColor>
+            </categoryItem>
+            <itemActions>
+                <relatedProductBackgroundColor>#000000</relatedProductBackgroundColor>
+            </itemActions>
+        </native>
+        <extra>
+            <fontColors>
+                <header>#000000</header>
+                <primary>#000000</primary>
+                <secondary>#000000</secondary>
+                <price>#000000</price>
+            </fontColors>
+        </extra>
+    </configuration>
+</theme>
diff --git a/media/xmlconnect/themes/test_white.xml b/media/xmlconnect/themes/test_white.xml
new file mode 100644
index 0000000000..81d28e6a75
--- /dev/null
+++ b/media/xmlconnect/themes/test_white.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_XmlConnect
+ * @copyright   Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<theme>
+    <manifest>
+        <name>test_white</name>
+        <label>(Testing) Pure White</label>
+        <version>1.0</version>
+        <requires>1.4.0.2</requires>
+    </manifest>
+    <configuration>
+        <native>
+            <navigationBar>
+                <tintColor>#FFFFFF</tintColor>
+            </navigationBar>
+            <body>
+                <primaryColor>#FFFFFF</primaryColor>
+                <secondaryColor>#FFFFFF</secondaryColor>
+                <backgroundColor>#FFFFFF</backgroundColor>
+                <scrollBackgroundColor>#FFFFFF</scrollBackgroundColor>
+            </body>
+            <categoryItem>
+                <tintColor>#FFFFFF</tintColor>
+                <backgroundColor>#FFFFFF</backgroundColor>
+            </categoryItem>
+            <itemActions>
+                <relatedProductBackgroundColor>#FFFFFF</relatedProductBackgroundColor>
+            </itemActions>
+        </native>
+        <extra>
+            <fontColors>
+                <header>#FFFFFF</header>
+                <primary>#FFFFFF</primary>
+                <secondary>#FFFFFF</secondary>
+                <price>#FFFFFF</price>
+            </fontColors>
+        </extra>
+    </configuration>
+</theme>
diff --git a/skin/adminhtml/default/default/boxes.css b/skin/adminhtml/default/default/boxes.css
index 6a9fcbfbd7..b58e3fe141 100644
--- a/skin/adminhtml/default/default/boxes.css
+++ b/skin/adminhtml/default/default/boxes.css
@@ -765,7 +765,7 @@ ul.item-options li { padding-left:.7em; }
 
 /* Product Configuration Popup */
 #popup-window-mask,
-.popup-window-mask { position:absolute; top:0; right:0; bottom:0; left:0; width:100%; height:100%; z-index:399; background-color:#efefef; opacity:.5; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";/*IE8*/ }
+.popup-window-mask { background:url(images/bg_window_mask.png) repeat 0 0; background:rgba(239, 239, 239, 0.5); position:absolute; top:0; right:0; bottom:0; left:0; width:100%; height:100%; z-index:399; }
 .product-configure-popup { background:#fafafa; border:1px solid #d6d6d6; left:50%; margin:0 0 0 -271px; position:fixed; top:50%; width:540px; z-index:400; }
 .product-configure-popup .validation-advice { margin-left:0; }
 #product_composite_configure_messages { margin-left:0 !important; padding:10px 15px; }
diff --git a/skin/adminhtml/default/default/iestyles.css b/skin/adminhtml/default/default/iestyles.css
index 24d34c4e5c..b4b340a7b0 100644
--- a/skin/adminhtml/default/default/iestyles.css
+++ b/skin/adminhtml/default/default/iestyles.css
@@ -58,7 +58,8 @@ ul.tabs li a,
 .uploader .file-row,
 .grid tr.filter .range .range-line,
 .centinel .authentication,
-.paypal-payment-notice { zoom:1; }
+.paypal-payment-notice,
+.product-options .options-list li { zoom:1; }
 
 .clear { display:block; clear:both; height:0; font-size:0; line-height:0; overflow:hidden; }
 
@@ -76,6 +77,9 @@ button.disabled:active { filter:alpha(opacity=80); }
 
 .message-popup .message-popup-content .message { _height:4.5em; }
 
+#popup-window-mask,
+.popup-window-mask { background:#efefef; filter:alpha(opacity=50); }
+
 /* Scalable Button Override */
 button, .form-button            { width:auto; margin-left:5px; overflow:visible; }
 .massaction button              { width:auto; height: 20px; margin-left:0; overflow:hidden; }
diff --git a/skin/adminhtml/default/default/images/bg_window_mask.png b/skin/adminhtml/default/default/images/bg_window_mask.png
new file mode 100644
index 0000000000..1824283aa6
Binary files /dev/null and b/skin/adminhtml/default/default/images/bg_window_mask.png differ
diff --git a/skin/adminhtml/default/default/images/xmlconnect/loading.gif b/skin/adminhtml/default/default/images/xmlconnect/loading.gif
new file mode 100644
index 0000000000..c3c7b84911
Binary files /dev/null and b/skin/adminhtml/default/default/images/xmlconnect/loading.gif differ
diff --git a/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/bg_content.jpg b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/bg_content.jpg
new file mode 100644
index 0000000000..06530a878e
Binary files /dev/null and b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/bg_content.jpg differ
diff --git a/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/bg_header_catalog.png b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/bg_header_catalog.png
new file mode 100644
index 0000000000..01897f8d77
Binary files /dev/null and b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/bg_header_catalog.png differ
diff --git a/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/bg_header_home.png b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/bg_header_home.png
new file mode 100644
index 0000000000..80cd5144a7
Binary files /dev/null and b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/bg_header_home.png differ
diff --git a/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/bg_home_content.jpg b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/bg_home_content.jpg
new file mode 100644
index 0000000000..9b480b6cf9
Binary files /dev/null and b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/bg_home_content.jpg differ
diff --git a/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/bg_home_header.png b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/bg_home_header.png
new file mode 100644
index 0000000000..d47261009d
Binary files /dev/null and b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/bg_home_header.png differ
diff --git a/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/logo_big.png b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/logo_big.png
new file mode 100644
index 0000000000..1c331e6f7b
Binary files /dev/null and b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/android/logo_big.png differ
diff --git a/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/ipad/bg_home_content.jpg b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/ipad/bg_home_content.jpg
new file mode 100644
index 0000000000..9b480b6cf9
Binary files /dev/null and b/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/ipad/bg_home_content.jpg differ
diff --git a/skin/adminhtml/default/default/xmlconnect/boxes.css b/skin/adminhtml/default/default/xmlconnect/boxes.css
index 540e4ae1c9..809cb8f014 100644
--- a/skin/adminhtml/default/default/xmlconnect/boxes.css
+++ b/skin/adminhtml/default/default/xmlconnect/boxes.css
@@ -36,7 +36,15 @@
 #field_tabs { padding:0 !important; }
 #field_tabs .mm-tabs-title { background:#ececec; padding:4px 10px; margin:0 -10px 15px; font-weight:bold; }
 #field_tabs table { width:500px !important; margin:0 10px 20px 10px; }
-.ipad-horizontal { height:350px; width:467px; }
-.ipad-portrait { height:467px; width:350px; }
-.ipad-tab-portrait { width:308px; }
-.ipad-tab-horizontal { width:425px; }
\ No newline at end of file
+
+.preview-loading,
+.ipad-portrait-loading,
+.ipad-landscape-loading { background:url(../images/xmlconnect/loading.gif) no-repeat 50% 40%; color:#d4d4d4; font-size:18px; line-height:467px; text-align:center; }
+
+.preview-loading { line-height:488px; text-align:center; margin:0 0 10px; height:488px; width:328px; }
+.ipad-portrait-loading { line-height:467px; }
+.ipad-landscape-loading { line-height:350px; }
+
+.ipad-portrait { margin:0 0 5px; overflow:hidden; }
+.ipad-landscape { margin:0 0 5px; }
+.ipad-tab-landscape { width:425px; }
\ No newline at end of file
diff --git a/skin/adminhtml/default/default/xmlconnect/fonts/android_icons-webfont.eot b/skin/adminhtml/default/default/xmlconnect/fonts/android_icons-webfont.eot
new file mode 100644
index 0000000000..1de39c4ad5
Binary files /dev/null and b/skin/adminhtml/default/default/xmlconnect/fonts/android_icons-webfont.eot differ
diff --git a/skin/adminhtml/default/default/xmlconnect/fonts/android_icons-webfont.svg b/skin/adminhtml/default/default/xmlconnect/fonts/android_icons-webfont.svg
new file mode 100644
index 0000000000..281ebcfb87
--- /dev/null
+++ b/skin/adminhtml/default/default/xmlconnect/fonts/android_icons-webfont.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG webfont generated by Font Squirrel.
+</metadata>
+<defs>
+<font id="webfontqwzMaTVL" horiz-adv-x="1024" >
+<font-face units-per-em="2048" ascent="1536" descent="-512" />
+<missing-glyph horiz-adv-x="500" />
+<glyph unicode=" " />
+<glyph unicode="A" horiz-adv-x="1705" d="M186 63v54v136v180q0 97 1 182t1 147v72q0 16 -7 23t-15 11t-21 4h-133q-12 0 -12 9q-1 2 -1 4t1 4v86l776 457l789 -451v-84q0 -18 -9 -23q-4 -4 -8 -2h-202q-14 0 -19.5 -6t-9.5 -12q-4 -8 -4 -16v-744q0 -35 -1 -53t-3 -29q-2 -10 -4 -12h-101q-8 0 -10 14.5t-4 32.5 q-2 23 -2 49v152q0 59 1 115.5t1 78.5q0 23 -9.5 34t-19.5 16q-12 6 -26 6h-115q-47 0 -90 1t-64 1q-20 0 -31.5 -9.5t-15.5 -19.5q-6 -12 -6 -29v-331q0 -41 -16.5 -63.5t-34.5 -33.5q-23 -12 -51 -14h-461q-25 0 -38 10t-18.5 22.5t-6.5 21.5zM186 1397q0 -2 1 10t20 12 h147q4 0 11 -2q10 -6 10 -18v-154q-4 0 -34 -17l-65 -38l-90 -55v213v49z" />
+<glyph unicode="B" horiz-adv-x="1705" d="M317 1010q0 88 29 164.5t79 135t116.5 92.5t144.5 34q76 0 142.5 -34t115.5 -92.5t78 -135t29 -164.5t-29 -166t-78 -136.5t-115.5 -92t-142.5 -33.5q-78 0 -144.5 33.5t-116.5 92t-79 136.5t-29 166zM715 0h-695q-2 0 -11 2t-9 18v138q72 121 137 219q27 41 57 80l55 69 q26 31 48 50.5t39 19.5h55q14 0 29 -6q12 -4 26.5 -16.5t28.5 -36.5q27 -49 45.5 -60.5t38.5 -11.5q10 0 30.5 -1t43.5 -3q25 -2 55 -2q29 0 51 2q20 2 41 3t31 1q20 0 38.5 11t45.5 61q12 25 27.5 37t27.5 16q14 6 29 6h55q14 0 37 -19.5t49.5 -50t55.5 -69.5l57 -80 q66 -98 137 -219v-138q0 -16 -9 -18t-11 -2h-635z" />
+<glyph unicode="C" horiz-adv-x="1705" d="M895 528l46 49q22 22 24 25q2 2 23.5 -8t47.5 -25q31 -16 68 -39l328 -325q-2 -12 -11 -31q-8 -16 -24.5 -38.5t-46.5 -53.5q-31 -31 -53.5 -47.5t-39.5 -24.5q-18 -8 -28 -10l-150 147l-111 110q-52 52 -67 69q-16 14 -28.5 36.5t-22.5 45.5q-12 25 -23 53zM0 901 q0 111 42 208t113.5 170t169 115t207.5 42q111 0 208.5 -42t169 -115t113.5 -170t42 -208t-42 -208t-113.5 -168.5t-169 -113.5t-208.5 -42t-208 42t-168.5 113.5t-113.5 168.5t-42 208zM203 901q0 -68 25.5 -128t70.5 -104t104.5 -70t126.5 -26q68 0 127.5 26t104.5 70 t70.5 104.5t25.5 127.5q0 68 -25.5 128.5t-70.5 105.5t-104.5 70.5t-127.5 25.5t-127 -25.5t-104 -70.5t-70.5 -105.5t-25.5 -128.5z" />
+<glyph unicode="&#xa0;" />
+<glyph unicode="&#x2000;" horiz-adv-x="716" />
+<glyph unicode="&#x2001;" horiz-adv-x="1435" />
+<glyph unicode="&#x2002;" horiz-adv-x="716" />
+<glyph unicode="&#x2003;" horiz-adv-x="1435" />
+<glyph unicode="&#x2004;" horiz-adv-x="477" />
+<glyph unicode="&#x2005;" horiz-adv-x="358" />
+<glyph unicode="&#x2006;" horiz-adv-x="237" />
+<glyph unicode="&#x2007;" horiz-adv-x="237" />
+<glyph unicode="&#x2008;" horiz-adv-x="178" />
+<glyph unicode="&#x2009;" horiz-adv-x="286" />
+<glyph unicode="&#x200a;" horiz-adv-x="77" />
+<glyph unicode="&#x2013;" d="M205 512v205h614v-205h-614z" />
+<glyph unicode="&#x2014;" horiz-adv-x="2048" d="M205 512v205h1638v-205h-1638z" />
+<glyph unicode="&#x202f;" horiz-adv-x="286" />
+<glyph unicode="&#x205f;" horiz-adv-x="358" />
+<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0v0v0v0v0z" />
+</font>
+</defs></svg> 
\ No newline at end of file
diff --git a/skin/adminhtml/default/default/xmlconnect/fonts/android_icons-webfont.ttf b/skin/adminhtml/default/default/xmlconnect/fonts/android_icons-webfont.ttf
new file mode 100644
index 0000000000..39196ad7df
Binary files /dev/null and b/skin/adminhtml/default/default/xmlconnect/fonts/android_icons-webfont.ttf differ
diff --git a/skin/adminhtml/default/default/xmlconnect/fonts/android_icons-webfont.woff b/skin/adminhtml/default/default/xmlconnect/fonts/android_icons-webfont.woff
new file mode 100644
index 0000000000..6e1dc39ae2
Binary files /dev/null and b/skin/adminhtml/default/default/xmlconnect/fonts/android_icons-webfont.woff differ
diff --git a/skin/adminhtml/default/default/xmlconnect/mobile-android.css b/skin/adminhtml/default/default/xmlconnect/mobile-android.css
index 13ea40c0c5..88a6f10dc3 100644
--- a/skin/adminhtml/default/default/xmlconnect/mobile-android.css
+++ b/skin/adminhtml/default/default/xmlconnect/mobile-android.css
@@ -28,20 +28,20 @@
     font-weight: normal;
     font-style: normal;
 }
-* {
-    background:transparent;
-    margin:0;
-    padding:0;
-    }
-ul {
-    list-style:none;
-    }
-body {
-    font:12px/15px Verdana;
-    line-height:1;
-    }
+
+@font-face {
+    font-family: 'icons';
+    src: url('fonts/android_icons-webfont.eot');
+    src: local('O'), url('fonts/android_icons-webfont.woff') format('woff'), url('fonts/android_icons-webfont.ttf') format('truetype'), url('fonts/android_icons-webfont.svg#webfontyMStiDRV') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+
 .main-frame {
     background:url(../images/xmlconnect/mobile_preview/android/bg_frame.gif) no-repeat 0 0;
+    font:12px/15px Verdana;
+    line-height:1;
+    margin:0 0 10px;
     padding:4px;
     height:480px;
     width:320px;
@@ -56,25 +56,34 @@ body {
     height:48px;
     width:320px;
     }
-    .header-wrap .header {
+    .header-wrap .app-header {
         height:48px;
         }
         .header-wrap .icon {
+            font-family:'icons';
+            font-size:35px;
+            line-height:48px;
+            text-align:center;
+            text-shadow:0 1px 0 #333;
             float:right;
             height:48px;
-            width:48px;
+            width:47px;
             }
             .header-wrap .icon-home {
-                background:url(../images/xmlconnect/mobile_preview/android/ico_home.png) no-repeat 0 0;
+                border-right:1px solid #333;
                 float:left;
                 }
             .header-wrap .icon-search {
-                background:url(../images/xmlconnect/mobile_preview/android/ico_search.png) no-repeat 0 0;
+                border-left:1px solid #333;
+                padding-left:5px;
+                width:42px;
                 }
             .header-wrap .icon-account {
-                background:url(../images/xmlconnect/mobile_preview/android/ico_account.png) no-repeat 0 0;
+                border-left:1px solid #333;
+                padding-left:5px;
+                width:42px;
                 }
-        .header-wrap .logo {
+        .header-wrap .app-logo {
             color:#fff;
             float:left;
             font-size:13px;
@@ -82,12 +91,13 @@ body {
             padding:12px 0 0 45px;
             text-shadow:0 0 5px #333;
             }
-            .header-wrap .logo img {
+            .header-wrap .app-logo img {
                 margin-right:10px;
                 vertical-align:middle;
                 }
 .home-page .content {
     background:url(../images/xmlconnect/mobile_preview/android/bg_logo.png) no-repeat center;
+    padding:0;
     height:267px;
     width:320px;
     }
@@ -248,13 +258,14 @@ body {
                 .catalog-page .cat-list .col-1 .rating img,
                 .catalog-page .cat-list .col-1 .rating span {
                     font-size:10px;
-                    vertical-align:middle;
                     }
         .catalog-page .cat-list .col-2 {
             }
             .catalog-page .cat-list .col-2 h3 {
                 color:#222222;
                 font-size:14px;
+                line-height:1;
+                margin:0;
                 font-weight:normal;
                 }
             .catalog-page .cat-list .col-2 .price-box {
diff --git a/skin/adminhtml/default/default/xmlconnect/mobile-catalog.css b/skin/adminhtml/default/default/xmlconnect/mobile-catalog.css
index 18602e891c..77b3c84686 100644
--- a/skin/adminhtml/default/default/xmlconnect/mobile-catalog.css
+++ b/skin/adminhtml/default/default/xmlconnect/mobile-catalog.css
@@ -20,501 +20,94 @@
  * @copyright  Copyright (c) 2010 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
  * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
-body { margin: 0; padding: 0 }
 
 @font-face {
-    font-family: 'stars';
-    src: url('fonts/stars-webfont.eot');
-    src: local('O'), url('fonts/stars-webfont.woff') format('woff'), url('fonts/stars-webfont.ttf') format('truetype'), url('fonts/stars-webfont.svg#webfontyMStiDRV') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-
-.main-frame
-{ 
-    background:url(../images/xmlconnect/mobile_preview/mm-frame.gif) 0 0 no-repeat;
-    padding:4px;
-}
-
-.main-block 
-{
-    width:320px;
-    height:478px;
-    position:relative;
-    overflow:hidden;
-}
-.header-sign-1
-{
-    font:bold 13px/19px arial !important;
-    color:#e9e9e9;
-    float:left;    
-    padding:0 15px 0 6px;
-}
-.top-header 
-{
-    height:19px    
-}
-
-.battery 
-{
-    height:16px;
-    width:25px;
-    float:right;
-    margin:-2px 5px 5px 13px;
-}
-
-.volume 
-{
-    height:16px; 
-    width:25px;     
-    float:left;
-    margin-top:-2px;
-}
-
-.antenna 
-{
-    height:16px; 
-    width:18px;     
-    float:left;
-    margin-left:6px;
-}
-.time 
-{     
-    position:relative;
-    left:35px;
-    text-align:center;
-    font:bold 13px/19px arial;
-    color:#e9e9e9;
-    float:left;
-}
-
-.main-header 
-{
-    width:100%; 
-    height:44px;
-    color:#f3f3f3;
-    padding:0;
-    position:relative;
-}
-
-.login-btn
-{
-    float:right;
-    height:30px;
-    width:68px;
-    margin-top:7px;
-    font:bold 11px/30px arial;
-    color:#e9e9e9;
-}
-
-.login-body
-{
-    float:left;
-    background:url(../images/xmlconnect/mobile_preview/login-btn.png) 0 0 repeat-x;
-    line-height:29px;
-    height:29px;
-    padding:0 8px;
-}
-
-.login-left, .login-right, .login-left-alt
-{
-    float:left;
-    font:bold 1px/1px arial;
-    width:3px;
-    height:29px;
-}
-.login-left
-{
-    background:url(../images/xmlconnect/mobile_preview/login-btn-left.png) 0 0 no-repeat;
-}
-.login-left-alt 
-{
-    background:url(../images/xmlconnect/mobile_preview/login-btn-left-alt.png) 0 0 no-repeat;
-    width:12px;
-}
-.login-right
-{
-    width:4px;
-    background:url(../images/xmlconnect/mobile_preview/login-btn-right.png) 0 0 no-repeat;
-}
-
-.main-header .gradient { 
-    height:44px; 
-    width:100%;
-    position:absolute;
-    background:url(../images/xmlconnect/mobile_preview/gradients/header2.png) 0 0 no-repeat;
-    left:0;
-}
-
-.header-buttons,
-.header-buttons td { height:40px !important; padding:0 !important; margin:0 !important; }
-
-.info 
-{
-    text-align:center;
-    vertical-align:middle;
-    width:30px;
-    height:42px;
-}
-.logo-small 
-{
-    width:165px;
-    height:44px;
-    overflow:hidden;
-    text-align:center;
-    vertical-align:middle;
-}
-
-.logo-small div
-{
-    width:165px;
-    height:41px;
-    overflow:hidden;
-    text-align:center;
-    vertical-align:middle;
-}
-
-.logo-small img { vertical-align:middle; }
-.logo-small .sh-title { text-align:left; height:30px; vertical-align:middle; }
-.logo-small .sh-title1, 
-.logo-small .sh-title2 { font:bold 16px/44px arial !important; color:#000; position:relative; }
-.logo-small .sh-title2 { color:#fff; position:absolute; top:-13px; left:-1px; }
-
-.edit-filter {
-    width:75px;
-    float:left;
-    margin-right:10px;
-    margin-top:0;
-}           
-
-.back-button { float:left; margin:0 0 0 7px; width:60px; }
-
-.clearB 
-{
-	clear: both; 
-	height: 1px;
-}
-
-.filter-header
-{
-	height: 22px;
-	text-align: center;
-	vertical-align: middle;
-}
-.filter-header .gradient
-{
-    height:22px; 
-    width:100%;
-    position:absolute;
-    background:url(../images/xmlconnect/mobile_preview/gradients/header3.png) 0 0 repeat-x;
-    left:0;
-}
-.filter-applied 
-{
-	padding-top:1px;
-    color:#fff;
-    font:bold 10px/18px arial;
-}
-.filter-circle
-{
-    margin-left:99px;
-    display:block;
-    float:left;
-	width: 18px;
-	height: 18px;
-	background:url(../images/xmlconnect/mobile_preview/circle.png) 0 0 no-repeat;
-}
-.filter-text
-{
-    float:left;
-	padding: 0 0 0 5px;
-	font:bold 11px/20px arial;
-}
-.filter-lines
-{
-	float:right;
-	width:25px;
-	height:22px;
-	padding:0 25px 0 0;
-	background:url(../images/xmlconnect/mobile_preview/lines-h.png) 29px 7px no-repeat;
-}
-.sort-block 
-{
-	height:42px;
-	text-align: center;
-}
-.sort-block-inner 
-{
-	position:relative;
-    height:42px;
-    background:url(../images/xmlconnect/mobile_preview/gradients/sort-bg.png) 0 0 repeat-x !important;
-}
-.sort-block-inner-txt 
-{
-	float:left;  
-	width:75px; 
-	height:26px; 
-	padding-top: 12px; 
-    font:bold 11px/18px arial !important;
-}
-
-.sort-buttons
-{
-	text-align:center;
-	font:bold 11px/11px Helvetica, "Helvetica Neue", Verdana, sans-serif;
-	padding:0 5px 0 0;
-    width:234px; 
-    height:26px; 
-    margin-top:8px
-}
-
-.buttons-holder
-{
-    float:left;
-    margin:5px 0 0 5px;
-    -moz-border-radius:5px;
-    -webkit-border-radius:5px;
-    border-radius:5px;
-    -moz-box-shadow:0 1px 1px #bbb;
-    -webkit-box-shadow:0 1px 1px #bbb;
-    box-shadow:0 1px 1px #bbb;
-}
-
-.sort-block .button
-{
-    background:url(../images/xmlconnect/mobile_preview/sort_buttons/bg_button.png) no-repeat 0 0 #8c8c8c;
-    border:1px solid #606060;
-    display:inline;
-    float:left;
-    color:#fefefe;
-    font:bold 14px/16px Helvetica, "Helvetica Neue", Verdana, sans-serif;
-    padding:6px 9px 5px;
-    text-shadow:0 -1px 1px #222;
-    -moz-box-shadow:inset 0 1px 1px #777;
-    -webkit-box-shadow:inset 0 1px 1px #777;
-    box-shadow:inset 0 1px 1px #777;
-}
-
-.sort-block .button-pos
-{
-    padding-right:2px;
-    text-shadow:0 -1px 1px #666;
-    -moz-border-radius:5px 0 0 5px;
-    -webkit-border-radius:5px 0 0 5px;
-    border-radius:5px 0 0 5px;
-}
-
-.sort-block .button-name,
-.sort-block .button-price
-{
-    padding:6px 19px 5px;
-}
-
-.sort-block .button-name
-{
-    border-width:1px 0;
-}
-
-.sort-block .button-price
-{
-    -moz-border-radius:0 5px 5px 0;
-    -webkit-border-radius:0 5px 5px 0;
-    border-radius:0 5px 5px 0;
-}
-
-.sort-block .button img
-{
-    vertical-align:middle;
-}
-
-.active 
-{
-	color: #e9e9e9;
-}
-
-.inactive 
-{
-	color: #333;
-} 
-
-.item 
-{
-    font-family:Helvetica, "Helvetica Neue", Arial, sans-serif;
-	height: 91px;
-    position:relative;
-}
-
-.item .gradient
-{
-    height:88px; 
-    width:100%;
-    position:absolute;
-    bottom:0;
-    background: url(../images/xmlconnect/mobile_preview/gradients/item-bg.png) 0 0 repeat-x; 
-    left:0;
-}
-
-.slider
-{
-
-}
-
-.slider-item
-{
-	background: url('../images/xmlconnect/mobile_preview/actionsBg.png') left center repeat-x; 
-	width: 20%; 
-	height: 100%;
-	float: left;
-	text-align: center;
-}
-.slider-image
-{
-	position: relative;
-	top: 20px;
-}
-
-.slider-item-text
-{
-	position: relative;
-	top: 25px;
-}
-
-.lines-v 
-{
-	height: 91px;
-	width: 20px;
-	background: url('../images/xmlconnect/mobile_preview/lines-v.png') center center no-repeat;
-	float: left;
-}
-.arrow 
-{
-	height: 91px;
-	width: 20px;
-	background: url('../images/xmlconnect/mobile_preview/arrow.png') center center no-repeat;
-	float: right;
-}
-.item-image 
-{
-	padding: 10px 0 0 10px;
-	float: left;	
-}
-.item-image img
-{
-    -moz-box-shadow:0 2px 3px #999;
-    -webkit-box-shadow:0 2px 3px #999;
-    box-shadow:0 2px 3px #999;
-}
-.item-info
-{
-	float: left;	
-	text-align: left;
-	padding: 10px 0 0 20px;
-}
-.item-title 
-{
-    font:bold 12px/15px "Helvetica Neue", Helvetica, Verdana, sans-serif !important;
-	padding:0;	
-}
-
-.item-price-block span,
-.availability span,
-.slider-item-text
-{
-    font-family:"Helvetica Neue", Helvetica, Verdana, sans-serif !important;
-}
-
-.slider-item-text
-{
-    font-size:10px !important;
-    padding:0 5px;
-}
-
-.item-price-block span {
-    font:bold 12px/14px Tahoma, Verdana, Geneva !important;
-}
-
-.item-price-block
-{
-    padding:2px 0 0;
-}
-
-.availability
-{
-    padding:5px 0;
-}
-
-.item-rate {
-    padding:4px 0 0;
-}
-
-.item-rate .stars
-{
-    font-family:stars;
-    vertical-align:middle;
-}
-
-.item-rate .star
-{
-    vertical-align:top;
-}
-
-.item-rate strong
-{
-    font-size:10px;
-    vertical-align:text-top;
-}
-
-.item-rate
-{
-}	
-
-.bottom-buttons 
-{
-    height:48px;
-    position:absolute;
-    bottom:0;
-    background:#060606;
-    width:320px;
-}
-
-.bottom-buttons .gradient { 
-    position:absolute;
-    width:320px;
-    background:url(../images/xmlconnect/mobile_preview/gradients/footer.png) 0 0 no-repeat !important;
-}
-
-.bottom-button 
-{
-	height:26px;
-    vertical-align:top;
-}
-.bottom-button p
-{
-	text-align:center;
-	font:normal 10px/11px arial;
-	color:#9f9f9f;
-    margin:0;
-    padding-top:33px;
-    position:relative;
-    z-index:100;
-}
-
-.bottom-button-active p
-{
-    color:#fff;
-    margin-top:-46px;
-    font-weight:bold;
-}
-
-.bottom-button-active .background
-{
-    background:#fff;
-    height:44px;
-    position:relative;
-    -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=14)";
-    filter:alpha(opacity=14);
-    opacity:0.14;
-    -moz-border-radius:2px;
-    -webkit-border-radius:2px;
-    border-radius:2px;
-}
+    font-family:'stars';
+    src:url('fonts/stars-webfont.eot');
+    src:local('O'), url('fonts/stars-webfont.woff') format('woff'), url('fonts/stars-webfont.ttf') format('truetype'), url('fonts/stars-webfont.svg#webfontyMStiDRV') format('svg');
+    font-weight:normal;
+    font-style:normal;
+}
+
+.iphone-catalog .main-frame { background:url(../images/xmlconnect/mobile_preview/mm-frame.gif) 0 0 no-repeat; line-height:1; margin:0 0 10px; padding:4px; }
+.iphone-catalog .main-block { width:320px; height:478px; position:relative; overflow:hidden; }
+.iphone-catalog .header-sign-1 { font:bold 13px/19px arial !important; color:#e9e9e9; float:left; padding:0 15px 0 6px; }
+.iphone-catalog .top-header { height:19px; }
+.iphone-catalog .battery { height:16px; width:25px; float:right; margin:-2px 5px 5px 13px; }
+.iphone-catalog .volume { height:16px; width:25px; float:left; margin-top:-2px; }
+.iphone-catalog .antenna { height:16px; width:18px; float:left; margin-left:6px; }
+.iphone-catalog .time { position:relative; left:35px; text-align:center; font:bold 13px/19px arial; color:#e9e9e9; float:left; }
+.iphone-catalog .main-header { width:100%; height:44px; color:#f3f3f3; padding:0; position:relative; }
+.iphone-catalog .login-btn { float:right; height:30px; width:68px; margin-top:7px; font:bold 11px/30px arial; color:#e9e9e9; }
+.iphone-catalog .login-body { float:left; background:url(../images/xmlconnect/mobile_preview/login-btn.png) 0 0 repeat-x; line-height:29px; height:29px; padding:0 8px; }
+.iphone-catalog .login-left,
+.iphone-catalog .login-right,
+.iphone-catalog .login-left-alt { float:left; font:bold 1px/1px arial; width:3px; height:29px; }
+.iphone-catalog .login-left { background:url(../images/xmlconnect/mobile_preview/login-btn-left.png) 0 0 no-repeat; }
+.iphone-catalog .login-left-alt { background:url(../images/xmlconnect/mobile_preview/login-btn-left-alt.png) 0 0 no-repeat; width:12px; }
+.iphone-catalog .login-right { width:4px; background:url(../images/xmlconnect/mobile_preview/login-btn-right.png) 0 0 no-repeat; }
+.iphone-catalog .main-header .gradient { height:44px; width:100%; position:absolute; background:url(../images/xmlconnect/mobile_preview/gradients/header2.png) 0 0 no-repeat; left:0; }
+.iphone-catalog .header-buttons,
+.iphone-catalog .header-buttons td { height:40px !important; padding:0 !important; margin:0 !important; }
+.iphone-catalog .info { text-align:center; vertical-align:middle; width:30px; height:42px; }
+.iphone-catalog .logo-small { width:165px; height:44px; overflow:hidden; text-align:center; vertical-align:middle; }
+.iphone-catalog .logo-small div { width:165px; height:41px; overflow:hidden; text-align:center; vertical-align:middle; }
+.iphone-catalog .logo-small img { vertical-align:middle; }
+.iphone-catalog .logo-small .sh-title { text-align:left; height:30px; vertical-align:middle; }
+.iphone-catalog .logo-small .sh-title1, 
+.iphone-catalog .logo-small .sh-title2 { font:bold 16px/44px arial !important; color:#000; position:relative; }
+.iphone-catalog .logo-small .sh-title1 { display:inline-block; }
+.iphone-catalog .logo-small .sh-title2 { color:#fff; position:absolute; top:-1px; left:-1px; }
+.iphone-catalog .edit-filter { width:75px; float:left; margin-right:10px; margin-top:0; }
+.iphone-catalog .back-button { float:left; margin:0 0 0 7px; width:60px; }
+.iphone-catalog .clearB { clear:both; height:1px; }
+.iphone-catalog .filter-header { height:22px; text-align:center; vertical-align:middle; }
+.iphone-catalog .filter-header .gradient { height:22px; width:100%; position:absolute; background:url(../images/xmlconnect/mobile_preview/gradients/header3.png) 0 0 repeat-x; left:0; }
+.iphone-catalog .filter-applied { padding-top:1px; color:#fff; font:bold 10px/18px arial; }
+.iphone-catalog .filter-circle { margin-left:99px; display:block; float:left; width:18px; height:18px; background:url(../images/xmlconnect/mobile_preview/circle.png) 0 0 no-repeat; }
+.iphone-catalog .filter-text { float:left; padding:0 0 0 5px; font:bold 11px/20px arial; }
+.iphone-catalog .filter-lines { float:right; width:25px; height:22px; padding:0 25px 0 0; background:url(../images/xmlconnect/mobile_preview/lines-h.png) 29px 7px no-repeat; }
+.iphone-catalog .sort-block { height:42px; text-align:center; }
+.iphone-catalog .sort-block-inner { position:relative; height:42px; background:url(../images/xmlconnect/mobile_preview/gradients/sort-bg.png) 0 0 repeat-x !important; }
+.iphone-catalog .sort-block-inner-txt { float:left; width:75px; height:26px; padding-top:12px; font:bold 11px/18px arial !important; }
+.iphone-catalog .sort-buttons { text-align:center; font:bold 11px/11px Helvetica, "Helvetica Neue", Verdana, sans-serif; padding:0 5px 0 0; width:234px; height:26px; margin-top:8px; }
+.iphone-catalog .buttons-holder { float:left; margin:5px 0 0 5px; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; -moz-box-shadow:0 1px 1px #bbb; -webkit-box-shadow:0 1px 1px #bbb; box-shadow:0 1px 1px #bbb; }
+.iphone-catalog .sort-block .button { background:url(../images/xmlconnect/mobile_preview/sort_buttons/bg_button.png) no-repeat 0 0 #8c8c8c; border:1px solid #606060; display:inline; float:left; color:#fefefe; font:bold 14px/16px Helvetica, "Helvetica Neue", Verdana, sans-serif; padding:6px 9px 5px; text-shadow:0 -1px 1px #222; -moz-box-shadow:inset 0 1px 1px #777; -webkit-box-shadow:inset 0 1px 1px #777; box-shadow:inset 0 1px 1px #777; }
+.iphone-catalog .sort-block .button-pos { padding-right:2px; text-shadow:0 -1px 1px #666; -moz-border-radius:5px 0 0 5px; -webkit-border-radius:5px 0 0 5px; border-radius:5px 0 0 5px; }
+.iphone-catalog .sort-block .button-name,
+.iphone-catalog .sort-block .button-price { padding:6px 19px 5px; }
+.iphone-catalog .sort-block .button-name { border-width:1px 0; }
+.iphone-catalog .sort-block .button-price { -moz-border-radius:0 5px 5px 0; -webkit-border-radius:0 5px 5px 0; border-radius:0 5px 5px 0; }
+.iphone-catalog .sort-block .button img { vertical-align:middle; }
+.iphone-catalog .active { color:#e9e9e9; }
+.iphone-catalog .inactive {	color:#333; } 
+.iphone-catalog .item { font-family:Helvetica, "Helvetica Neue", Arial, sans-serif; height:91px; position:relative; }
+.iphone-catalog .item .gradient { height:88px; width:100%; position:absolute; bottom:0; background:url(../images/xmlconnect/mobile_preview/gradients/item-bg.png) 0 0 repeat-x; left:0; }
+.iphone-catalog .slider { background:url('../images/xmlconnect/mobile_preview/actionsBg.png') left center repeat-x; }
+.iphone-catalog .slider-item { width:20%; height:91px;	float:left; text-align:center; }
+.iphone-catalog .slider-image { position:relative;	top:20px; }
+.iphone-catalog .slider-item-text { position:relative;	top:25px; }
+.iphone-catalog .lines-v { height:91px; width:20px; background:url('../images/xmlconnect/mobile_preview/lines-v.png') center center no-repeat; float:left; }
+.iphone-catalog .arrow { height:91px; width:20px;	background:url('../images/xmlconnect/mobile_preview/arrow.png') center center no-repeat; float:right; }
+.iphone-catalog .item-image { padding:10px 0 0 10px; float:left; }
+.iphone-catalog .item-image img { -moz-box-shadow:0 2px 3px #999; -webkit-box-shadow:0 2px 3px #999; box-shadow:0 2px 3px #999; }
+.iphone-catalog .item-info { float:left; text-align:left;	padding:10px 0 0 20px; }
+.iphone-catalog .item-title { font:bold 12px/15px "Helvetica Neue", Helvetica, Verdana, sans-serif !important; padding:0; }
+.iphone-catalog .item-price-block span,
+.iphone-catalog .availability span,
+.iphone-catalog .slider-item-text { font-family:"Helvetica Neue", Helvetica, Verdana, sans-serif !important; }
+.iphone-catalog .slider-item-text { font-size:10px !important; padding:0 5px; }
+.iphone-catalog .item-price-block span { font:bold 12px/14px Tahoma, Verdana, Geneva !important; }
+.iphone-catalog .item-price-block { padding:2px 0 0; }
+.iphone-catalog .availability { padding:5px 0; }
+.iphone-catalog .item-rate { padding:4px 0 0; }
+.iphone-catalog .item-rate .stars { font-family:stars; font-size:16px; vertical-align:middle; }
+.iphone-catalog .item-rate .star { vertical-align:top; }
+.iphone-catalog .item-rate strong { font-size:10px; line-height:16px; vertical-align:text-top; }
+.iphone-catalog .item-rate {}	
+.iphone-catalog .bottom-buttons { height:48px; position:absolute; bottom:0; background:#060606; width:320px; }
+.iphone-catalog .bottom-buttons .gradient { position:absolute; width:320px; background:url(../images/xmlconnect/mobile_preview/gradients/footer.png) 0 0 no-repeat !important; }
+.iphone-catalog .bottom-button { height:26px; vertical-align:top; }
+.iphone-catalog .bottom-button p { text-align:center; font:normal 10px/11px arial; color:#9f9f9f; margin:0; padding-top:33px; position:relative; z-index:100; }
+.iphone-catalog .bottom-button-active p { color:#fff; margin-top:-46px; font-weight:bold; }
+.iphone-catalog .bottom-button-active .background { background:#fff; height:44px; position:relative; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=14)"; filter:alpha(opacity=14); opacity:0.14; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
diff --git a/skin/adminhtml/default/default/xmlconnect/mobile-home.css b/skin/adminhtml/default/default/xmlconnect/mobile-home.css
index 7779e28741..5c5970bfe1 100644
--- a/skin/adminhtml/default/default/xmlconnect/mobile-home.css
+++ b/skin/adminhtml/default/default/xmlconnect/mobile-home.css
@@ -20,264 +20,46 @@
  * @copyright  Copyright (c) 2010 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
  * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
-body { margin:0; padding:0; }
-
-.main-frame
-{ 
-    background:url(../images/xmlconnect/mobile_preview/mm-frame.gif) 0 0 no-repeat;
-    padding:4px;
-}
-
-.main-block 
-{
-	width:320px;
-	height:478px;
-    position:relative;
-    overflow:hidden;
-}
-.header-sign-1
-{
-	font:bold 13px/19px arial !important;
-	color:#e9e9e9;
-	float:left;	
-	padding:0 15px 0 6px;
-}
-.top-header 
-{
-	height:19px	
-}
-
-.battery 
-{
-	height:16px;
-	width:25px;
-	float:right;
-	margin:-2px 5px 5px 13px;
-}
-
-.volume 
-{
-	height:16px; 
-	width:25px; 	
-	float:left;
-    margin-top:-2px;
-}
-
-.antenna 
-{
-	height:16px; 
-	width:18px; 	
-	float:left;
-	margin-left:6px;
-}
-.time 
-{	 
-	position:relative;
-    left:35px;
-	text-align:center;
-	font:bold 13px/19px arial;
-	color:#e9e9e9;
-	float:left;
-}
-
-.main-header 
-{
-    width:100%; 
-    height:44px;
-    color:#f3f3f3;
-    padding:0;
-    position:relative;
-}
-
-.main-header .gradient { 
-    height:44px; 
-    width:100%;
-    position:absolute;
-    background:url(../images/xmlconnect/mobile_preview/gradients/header2.png) 0 0 no-repeat;
-    left:0;
-}
-
-.clearB 
-{
-	clear:both; 
-	height:1px;
-}
-
-.header-buttons,
-.header-buttons td { height:40px !important; padding:0 !important; margin:0 !important; }
-
-.info 
-{
-	text-align:left;
-    vertical-align:middle;
-    width:51px;
-    height:42px;
-}
-
-.info img {
-    margin-left:5px;
-}
-
-.logo-small 
-{
-	width:200px;
-    height:44px;
-    overflow:hidden;
-    text-align:center;
-    vertical-align:middle;
-}
-
-.logo-small div
-{
-    width:200px;
-    height:41px;
-    overflow:hidden;
-    text-align:center;
-    vertical-align:middle;
-}
-
-.logo-small img { vertical-align:middle; }
-.logo-small .sh-title { text-align:left; height:30px; vertical-align:middle; }
-.logo-small .sh-title1, 
-.logo-small .sh-title2 { font:bold 16px/44px arial !important; color:#000; position:relative; }
-.logo-small .sh-title2 { color:#fff; position:absolute; top:-13px; left:-1px; }
-
-.login-btn
-{
-    height:30px;
-    width:68px;
-    font:bold 11px/30px arial;
-    color:#e9e9e9;
-}
-
-.login-body
-{
-	float:left;
-	background:url(../images/xmlconnect/mobile_preview/login-btn.png) 0 0 repeat-x;
-    line-height:29px;
-    height:29px;
-    padding:0 8px;
-}
-
-.login-left, .login-right
-{
-    float:left;
-    font:bold 1px/1px arial;
-    width:3px;
-    height:29px;
-}
-.login-left
-{
-	background:url(../images/xmlconnect/mobile_preview/login-btn-left.png) 0 0 no-repeat;
-}
-.login-right
-{
-    width:4px;
-	background:url(../images/xmlconnect/mobile_preview/login-btn-right.png) 0 0 no-repeat;
-}
-
-.title 
-{
-	position:relative;
-	top:10px;
-	font:bold 19px arial;
-	color:#e9e9e9;	
-}
-.main-header-text 
-{
-	width:10px;
-}
-
-.big-logo 
-{
-	text-align:center;
-	padding:0;
-    height:230px; 
-    width:320px;
-    overflow:hidden;
-}
-.catalog 
-{
-	height:137px;
-    width:500px;
-    position:absolute;
-    padding-left:5px;
-}
-.item 
-{
-	float:left;
-    width:80px;
-    padding:5px 5px 3px 5px;
-	text-align:center;
-	margin:10px 5px 0 5px;
-	height:112px;
-    position:relative;
-}
-
-.item img {
-    display:block;
-    margin:0 0 10px 0;
-}
-
-.item-text 
-{
-	height:21px;
-	text-align:center;
-    margin-top:0px;
-    width:80px;
-    font:bold 12px/21px arial !important;
-    border-radius:6px;
-    -moz-border-radius:6px;
-    -webkit-border-radius:6px;
-}
-
-.bottom-buttons 
-{
-	height:48px;
-    position:absolute;
-    bottom:0;
-    background:#060606;
-    width:320px;
-}
-
-.bottom-buttons .gradient { 
-    position:absolute;
-    width:320px;
-    background:url(../images/xmlconnect/mobile_preview/gradients/footer.png) 0 0 no-repeat !important;
-}
-
-.bottom-button 
-{
-	height:26px;
-    vertical-align:top;
-}
-.bottom-button p
-{
-	text-align:center;
-	font:normal 10px/11px arial;
-	color:#9f9f9f;
-    margin:0;
-    padding-top:33px;
-    position:relative;
-    z-index:100;
-}
-
-.bottom-button-active p
-{
-    color:#fff;
-    margin-top:-46px;
-    font-weight:bold;
-}
-
-.bottom-button-active .background
-{
-    background:#fff;
-    height:44px;
-    position:relative;
-    -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=14)";
-    filter:alpha(opacity=14);
-    opacity:0.14;
-    -moz-border-radius:2px;
-    -webkit-border-radius:2px;
-    border-radius:2px;
-}
\ No newline at end of file
+ 
+.iphone-home .main-frame { background:url(../images/xmlconnect/mobile_preview/mm-frame.gif) 0 0 no-repeat; line-height:1; margin:0 0 10px; padding:4px; }
+.iphone-home .main-block { position:relative; height:478px; width:320px; overflow:hidden; }
+.iphone-home .header-sign-1 { font:bold 13px/19px arial !important; color:#e9e9e9; float:left; padding:0 15px 0 6px; }
+.iphone-home .top-header { height:19px; }
+.iphone-home .battery { height:16px;	width:25px;	float:right; margin:-2px 5px 5px 13px; }
+.iphone-home .volume { height:16px; width:25px; float:left; margin-top:-2px; }
+.iphone-home .antenna { height:16px; width:18px; float:left;	margin-left:6px; }
+.iphone-home .time {	position:relative; left:35px; text-align:center; font:bold 13px/19px arial;	color:#e9e9e9; float:left; }
+.iphone-home .main-header { width:100%; height:44px; color:#f3f3f3; padding:0; position:relative; }
+.iphone-home .main-header .gradient { background:url(../images/xmlconnect/mobile_preview/gradients/header2.png) 0 0 no-repeat; height:44px; width:100%; position:absolute; left:0; }
+.iphone-home .clearB { clear:both; height:1px; }
+.iphone-home .header-buttons,
+.iphone-home .header-buttons td { height:40px !important; padding:0 !important; margin:0 !important; vertical-align:middle; }
+.iphone-home .header-buttons .login-btn { padding:5px 0 0 !important; height:35px !important; width:68px; font:bold 11px/30px arial; color:#e9e9e9; }
+.iphone-home .info { text-align:left; vertical-align:middle; width:51px; height:42px; }
+.iphone-home .info img { margin-left:5px; }
+.iphone-home .logo-small { width:200px; height:44px; overflow:hidden; text-align:center; vertical-align:middle; }
+.iphone-home .logo-small div { width:200px; height:41px; overflow:hidden; text-align:center; vertical-align:middle; }
+.iphone-home .logo-small img { vertical-align:middle; }
+.iphone-home .logo-small .sh-title { text-align:left; height:30px; vertical-align:middle; }
+.iphone-home .logo-small .sh-title1, 
+.iphone-home .logo-small .sh-title2 { font:bold 16px/44px arial !important; color:#000; position:relative; }
+.iphone-home .logo-small .sh-title1 { display:inline-block; }
+.iphone-home .logo-small .sh-title2 { color:#fff; position:absolute; top:-1px; left:-1px; }
+.iphone-home .login-body { float:left; background:url(../images/xmlconnect/mobile_preview/login-btn.png) 0 0 repeat-x; line-height:29px; height:29px; padding:0 8px; }
+.iphone-home .login-left,
+.iphone-home .login-right { float:left; font:bold 1px/1px arial; width:3px; height:29px; }
+.iphone-home .login-left { background:url(../images/xmlconnect/mobile_preview/login-btn-left.png) 0 0 no-repeat; }
+.iphone-home .login-right { background:url(../images/xmlconnect/mobile_preview/login-btn-right.png) 0 0 no-repeat; width:4px; }
+.iphone-home .title { position:relative; top:10px; font:bold 19px arial; color:#e9e9e9; }
+.iphone-home .main-header-text { width:10px; }
+.iphone-home .big-logo { text-align:center; padding:0; height:230px; width:320px; overflow:hidden; }
+.iphone-home .catalog { height:137px; width:500px; position:absolute; padding-left:5px; }
+.iphone-home .item { float:left; width:80px; padding:5px 5px 3px 5px; text-align:center;	margin:10px 5px 0 5px; height:112px; position:relative; }
+.iphone-home .item img { display:block; margin:0 0 10px 0; }
+.iphone-home .item-text { height:21px; text-align:center; margin-top:0px; width:80px; font:bold 12px/21px arial !important; border-radius:6px; -moz-border-radius:6px; -webkit-border-radius:6px; }
+.iphone-home .bottom-buttons { height:48px; position:absolute; bottom:0; background:#060606; width:320px; }
+.iphone-home .bottom-buttons .gradient { position:absolute; width:320px; background:url(../images/xmlconnect/mobile_preview/gradients/footer.png) 0 0 no-repeat !important; }
+.iphone-home .bottom-button { height:26px; vertical-align:top; }
+.iphone-home .bottom-button p { text-align:center; font:normal 10px/11px arial; color:#9f9f9f; margin:0; padding-top:33px; position:relative; z-index:100; }
+.iphone-home .bottom-button-active p { color:#fff; margin-top:-46px; font-weight:bold; }
+.iphone-home .bottom-button-active .background { background:#fff; height:44px; position:relative; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=14)"; filter:alpha(opacity=14); opacity:0.14; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
diff --git a/skin/adminhtml/default/default/xmlconnect/mobile-ipad-catalog.css b/skin/adminhtml/default/default/xmlconnect/mobile-ipad-catalog.css
index 5f0efb98f9..fafad2f2b0 100644
--- a/skin/adminhtml/default/default/xmlconnect/mobile-ipad-catalog.css
+++ b/skin/adminhtml/default/default/xmlconnect/mobile-ipad-catalog.css
@@ -20,6 +20,7 @@
  * @copyright  Copyright (c) 2010 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
  * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+ 
  @font-face {
     font-family: 'stars';
     src: url('fonts/stars-webfont.eot');
@@ -27,118 +28,110 @@
     font-weight: normal;
     font-style: normal;
 }
-* {
-    margin:0; padding:0;
-    }
-ol,
-ul {
-    list-style:none;
-    }
-a  {
-    color:#000;
-    text-decoration:none;
-    }
-body {
+
+.ipad-catalog {
     font-family:"Helvetica Neue", Helvetica, Verdana, sans-serif;
     line-height:1;
-    }
-
-.ipad {
     height:467px;
     width:350px;
     }
-.ipad-horizontal {
+.ipad-catalog-landscape {
     height:350px;
     width:467px;
     }
-    .ipad .status-bar {
+.ipad-catalog a {
+    color:#000;
+    text-decoration:none;
+    }
+    .ipad-catalog .status-bar {
         background:url(../images/xmlconnect/mobile_preview/ipad/bg_status_bar.png) no-repeat 0 0;
         height:9px;
         font-size:0;
         line-height:0;
         }
-    .ipad-horizontal .status-bar {
+    .ipad-catalog-landscape .status-bar {
         background-image:url(../images/xmlconnect/mobile_preview/ipad/bg_status_bar_hor.png);
         }
-    .ipad .header-wrap {
+    .ipad-catalog .header-wrap {
         background:url(../images/xmlconnect/mobile_preview/ipad/bg_header.png) no-repeat 0 0 #000;
         height:20px;
         position:relative;
         }
-    .ipad-horizontal .header-wrap {
+    .ipad-catalog-landscape .header-wrap {
         background-image:url(../images/xmlconnect/mobile_preview/ipad/bg_catalog_header_hor.png);
         height:20px;
         }
-        .ipad .header .logo {
+        .ipad-catalog .app-header .app-logo {
             margin-left:80px;
             margin-right:1px;
             }
-        .ipad-horizontal .header .logo {
+        .ipad-catalog-landscape .app-header .app-logo {
             margin-left:130px;
             }
-            .ipad .header .logo img {
+            .ipad-catalog .app-header .app-logo img {
                 vertical-align:middle;
                 }
-        .ipad .header .store-name {
+        .ipad-catalog .app-header .store-name {
             color:#fff;
             font-size:9px;
             line-height:20px;
             margin-right:10px;
             vertical-align:middle;
             }
-        .ipad-horizontal .header .store-name {
+        .ipad-catalog-landscape .app-header .store-name {
             margin-right:80px;
             }
-        .ipad .header img,
-        .ipad .header span span {
+        .ipad-catalog .app-header img,
+        .ipad-catalog .app-header span span {
             vertical-align:top;
             }
-        .ipad .header .search {
+        .ipad-catalog .app-header .search {
             font-size:6px;
             position:absolute;
             top:3px;
             right:105px;
             }
-        .ipad .header .info,
-        .ipad .header .login,
-        .ipad .header .cart {
+        .ipad-catalog .app-header .info,
+        .ipad-catalog .app-header .login,
+        .ipad-catalog .app-header .cart {
             float:right;
             position:relative;
             padding:0 5px;
             top:5px;
             }
-        .ipad .header .info {
+        .ipad-catalog .app-header .info {
             top:6px;
             }
-        .ipad .header .login {
+        .ipad-catalog .app-header .login {
             margin-left:20px;
             }
-        .ipad .header .cart {
+        .ipad-catalog .app-header .cart {
             margin-left:20px;
             }
-    .ipad .filters-wrap {
+    .ipad-catalog .filters-wrap {
         background:url(../images/xmlconnect/mobile_preview/ipad/bg_filters_wrap.png) no-repeat 0 0 #c7c7c7;
         height:15px;
         position:relative;
         }
-    .ipad-horizontal .filters-wrap {
+    .ipad-catalog-landscape .filters-wrap {
         float:left;
         display:inline;
         width:341px;
         }
-        .ipad .filters h3 {
+        .ipad-catalog .filters h3 {
             color:#424242;
             font-size:6px;
             line-height:15px;
             float:left;
+            margin:0;
             padding:0 5px;
             }
-        .ipad .filters ul {
+        .ipad-catalog .filters ul {
             color:#424242;
             font-size:7px;
             padding:1px 0 0;
             }
-            .ipad .filters li {
+            .ipad-catalog .filters li {
                 background:url(../images/xmlconnect/mobile_preview/ipad/bg_filters_buttons.png) no-repeat #a5a5a5;
                 border:1px solid #8f8f8f;
                 display:inline;
@@ -147,22 +140,22 @@ body {
                 float:left;
                 width:45px;
                 }
-                .ipad .filters .position {
+                .ipad-catalog .filters .position {
                     background:#ffa65a;
                     -moz-border-radius:2px 0 0 2px;
                     -webkit-border-radius:2px 0 0 2px;
                     border-radius:2px 0 0 2px;
                     border-right:none;
                     }
-                .ipad .filters .home {
+                .ipad-catalog .filters .home {
                     border-right:none;
                     }
-                .ipad .filters .price {
+                .ipad-catalog .filters .price {
                     -moz-border-radius:0 2px 2px 0;
                     -webkit-border-radius:0 2px 2px 0;
                     border-radius:0 2px 2px 0;
                     }
-        .ipad .filters-wrap .filter-button {
+        .ipad-catalog .filters-wrap .filter-button {
             background:url(../images/xmlconnect/mobile_preview/ipad/bg_filter_button.png) no-repeat #e3710a;
             color:#000;
             font-size:6px;
@@ -173,7 +166,7 @@ body {
             -webkit-border-radius:2px;
             border-radius:2px;
             }
-        .ipad .filters-wrap .filters-popup {
+        .ipad-catalog .filters-wrap .filters-popup {
             background:url(../images/xmlconnect/mobile_preview/ipad/bg_filters_tooltip.png) no-repeat 0 0;
             display:none;
             position:absolute;
@@ -221,54 +214,55 @@ body {
                     line-height:18px;
                     padding-left:10px;
                     }
-    .ipad .content {
+    .ipad-catalog .content {
         background:url(../images/xmlconnect/mobile_preview/ipad/bg_content.jpg) no-repeat top;
         float:left;
         display:inline;
         padding:15px 0 0 15px;
         height:407px;
         }
-    .ipad-horizontal .content {
+    .ipad-catalog-landscape .content {
         background-image:url(../images/xmlconnect/mobile_preview/ipad/background_landscape_home.jpg);
         padding:5px 0 0 10px;
         height:300px;
         width:331px;
         }
-        .ipad .products-list {
+        .ipad-catalog .products-list {
             font-size:7px;
             line-height:9px;
             overflow:hidden;
             width:100%;
             }
-            .ipad .products-list li {
+            .ipad-catalog .products-list li {
                 display:inline;
                 float:left;
                 margin:0 4px 4px 0;
                 }
-                .ipad .product-image img {
+                .ipad-catalog .product-image img {
                     margin:0 0 5px;
                     border:1px solid #fcfcfc;
                     vertical-align:bottom;
                     }
-                .ipad .products-list h4 {
+                .ipad-catalog .products-list h4 {
                     font-size:7px;
+                    margin:0;
                     }
-                .ipad .price-box {}
-                    .ipad .price-box span {
+                .ipad-catalog .price-box {}
+                    .ipad-catalog .price-box span {
                         display:block;
                         }
-                .ipad .rating .star {
+                .ipad-catalog .rating .star {
                     font-family:'stars';
                     font-size:8px;
                     }
-                .ipad .rating img {
+                .ipad-catalog .rating img {
                     margin-right:4px;
                     }
-    .ipad-horizontal .bg {
+    .ipad-catalog-landscape .bg {
         overflow:hidden;
         width:100%;
         }
-    .ipad-horizontal .sections {
+    .ipad-catalog-landscape .sections {
         background:url(../images/xmlconnect/mobile_preview/ipad/bg_sections.jpg) no-repeat  0 0;
         border-right:1px solid #8c857f;
         display:inline;
@@ -277,7 +271,7 @@ body {
         width:125px;
         list-style:outside;
         }
-        .ipad-horizontal .sections li {
+        .ipad-catalog-landscape .sections li {
             background:#fff;
             border-bottom:1px solid #d1d1d1;
             font-size:8px;
@@ -285,9 +279,9 @@ body {
             line-height:20px;
             padding-left:5px;
             }
-        .ipad-horizontal .sections .arrow {
+        .ipad-catalog-landscape .sections .arrow {
             background:url(../images/xmlconnect/mobile_preview/ipad/sections_arrow.png) no-repeat 115px 6px #fff;
             }
-        .ipad-horizontal .sections .active {
+        .ipad-catalog-landscape .sections .active {
             background:#f2f2f2;
             }
\ No newline at end of file
diff --git a/skin/adminhtml/default/default/xmlconnect/mobile-ipad-home.css b/skin/adminhtml/default/default/xmlconnect/mobile-ipad-home.css
index 7930ddb734..d2032fd32d 100644
--- a/skin/adminhtml/default/default/xmlconnect/mobile-ipad-home.css
+++ b/skin/adminhtml/default/default/xmlconnect/mobile-ipad-home.css
@@ -20,37 +20,29 @@
  * @copyright  Copyright (c) 2010 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
  * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
-* {
-    margin:0; padding:0;
-    }
-ol,
-ul {
-    list-style:none;
-    }
-a  {
-    color:#000;
-    text-decoration:none;
-    }
-body {
-    font-family:"Helvetica Neue", Helvetica, Verdana, sans-serif;
-    line-height:1;
-    }
 
 .ipad {
+    font-family:"Helvetica Neue", Helvetica, Verdana, sans-serif;
+    line-height:1;
+    line-height:1;
     height:467px;
     width:350px;
     }
-.ipad-horizontal {
+.ipad-landscape {
     height:350px;
     width:467px;
     }
+    .ipad a {
+        color:#000;
+        text-decoration:none;
+        }
     .ipad .status-bar {
         background:url(../images/xmlconnect/mobile_preview/ipad/bg_status_bar.png) no-repeat 0 0;
         height:9px;
         font-size:0;
         line-height:0;
         }
-    .ipad-horizontal .status-bar {
+    .ipad-landscape .status-bar {
         background-image:url(../images/xmlconnect/mobile_preview/ipad/bg_status_bar_hor.png);
         }
     .ipad .header-wrap {
@@ -58,52 +50,52 @@ body {
         height:20px;
         position:relative;
         }
-    .ipad-horizontal .header-wrap {
+    .ipad-landscape .header-wrap {
         background-image:url(../images/xmlconnect/mobile_preview/ipad/bg_home_header_hor.png);
         height:20px;
         }
-        .ipad .header .logo {
+        .ipad .app-header .app-logo {
             margin-left:5px;
             margin-right:1px;
             }
-            .ipad .header .logo img {
+            .ipad .app-header .app-logo img {
                 vertical-align:middle;
                 }
-        .ipad .header .store-name {
+        .ipad .app-header .store-name {
             color:#fff;
             font-size:9px;
             line-height:20px;
             margin-right:85px;
             vertical-align:middle;
             }
-        .ipad-horizontal .header .store-name {
+        .ipad-landscape .app-header .store-name {
             margin-right:210px;
             }
-        .ipad .header img,
-        .ipad .header span span {
+        .ipad .app-header img,
+        .ipad .app-header span span {
             vertical-align:top;
             }
-        .ipad .header .search {
+        .ipad .app-header .search {
             font-size:6px;
             position:absolute;
             top:3px;
             right:105px;
             }
-        .ipad .header .info,
-        .ipad .header .login,
-        .ipad .header .cart {
+        .ipad .app-header .info,
+        .ipad .app-header .login,
+        .ipad .app-header .cart {
             float:right;
             position:relative;
             padding:0 5px;
             top:5px;
             }
-        .ipad .header .info {
+        .ipad .app-header .info {
             top:6px;
             }
-        .ipad .header .login {
+        .ipad .app-header .login {
             margin-left:20px;
             }
-        .ipad .header .cart {
+        .ipad .app-header .cart {
             margin-left:20px;
             }
     .ipad .shadow {
@@ -114,25 +106,26 @@ body {
         position:relative;
         margin:0 0 -3px;
         }
-    .ipad-horizontal .shadow {
+    .ipad-landscape .shadow {
         background-image:url(../images/xmlconnect/mobile_preview/ipad/bg_home_shadow_hor.png);
         height:8px;
         margin-bottom:-8px;
         }
     .ipad .content {
         background:url(../images/xmlconnect/mobile_preview/ipad/background_portrait.jpg) no-repeat top center;
+        padding:0;
         height:438px;
         overflow:hidden;
         }
-    .ipad-horizontal .content {
+    .ipad-landscape .content {
         background-image:url(../images/xmlconnect/mobile_preview/ipad/background_landscape_home.jpg) top center;
         height:321px;
         }
-        .ipad .content .logo {
+        .ipad .content .app-logo {
             background:url(../images/xmlconnect/mobile_preview/ipad/logo_big.png) no-repeat center center;
             height:135px;
             }
-        .ipad-horizontal .content .logo {
+        .ipad-landscape .content .app-logo {
             height:170px;
             }
         .ipad .products-list-wrap {
@@ -145,12 +138,15 @@ body {
                 width:325px;
                 }
                 .ipad .products-list h4 {
+                    color:#000;
                     font-size:7px;
+                    line-height:1;
+                    margin:0;
                     }
-        .ipad-horizontal .products-list-wrap {
+        .ipad-landscape .products-list-wrap {
             width:467px;
             }
-            .ipad-horizontal .products-list {
+            .ipad-landscape .products-list {
                 margin-left:5px;
                 width:462px;
                 }
@@ -164,8 +160,11 @@ body {
                     -webkit-box-shadow:1px 3px 3px #444;
                     box-shadow:1px 3px 3px #444;
                     }
-                .ipad-horizontal .products-list li {
+                .ipad-landscape .products-list li {
                     }
                     .ipad .products-list .product-image {
                         margin:0 0 4px;
-                        }
\ No newline at end of file
+                        }
+                        .ipad .products-list .product-image img {
+                            vertical-align:bottom;
+                            }
diff --git a/skin/adminhtml/default/default/xmlconnect/styles.css b/skin/adminhtml/default/default/xmlconnect/styles.css
index 38f3bfb30d..4cc96c8b3d 100644
--- a/skin/adminhtml/default/default/xmlconnect/styles.css
+++ b/skin/adminhtml/default/default/xmlconnect/styles.css
@@ -31,4 +31,16 @@ border:1px}
 #field_colors td { padding:5px 20px !important; }
 #field_colors .hor-scroll { overflow:hidden; }
 .theme-select-cont { border-bottom:1px solid #dcdcdc; background:#f0f0f0; margin:-100px -100px 10px -100px; padding:100px 100px 0 100px; }
-.theme-selector-title { margin:0 30px 0 0px; }
\ No newline at end of file
+.theme-selector-title { margin:0 30px 0 0px; }
+
+.istore-buttons-set { float:right; margin:0 0 10px; }
+
+.istore { border:1px solid #eeeeee; border-collapse:separate; border-spacing:0; }
+.istore td { background:#f2f2f2; color:#000; line-height:18px; padding:5px 7px; }
+.istore td label { cursor:pointer; }
+.istore .odd td { background:#fafafa; }
+.istore .border { border-right:1px solid #dbdbdb; }
+.istore .border + td { border-left:1px solid #fff; }
+
+.androidmarket { border-collapse:collapse; border-spacing:0; }
+.androidmarket td { padding:2px; }
diff --git a/skin/frontend/default/blank/css/styles.css b/skin/frontend/default/blank/css/styles.css
index 0f4b2247c1..17c9a0631a 100644
--- a/skin/frontend/default/blank/css/styles.css
+++ b/skin/frontend/default/blank/css/styles.css
@@ -1032,6 +1032,8 @@ tr.summary-details-excluded { font-style:italic; }
 .opc .step .tool-tip { right:10px; }
 
 .opc .order-review {}
+.opc .order-review .authentication {}
+.opc .order-review .warning-message {}
 
 /* Multiple Addresses Checkout */
 .checkout-progress { padding:0 50px; margin:10px 0; }
diff --git a/skin/frontend/default/blue/css/styles.css b/skin/frontend/default/blue/css/styles.css
index cef7e20c2e..f6c7a3627a 100644
--- a/skin/frontend/default/blue/css/styles.css
+++ b/skin/frontend/default/blue/css/styles.css
@@ -1340,6 +1340,8 @@ tr.summary-details-excluded { font-style:italic; }
 #opc-review .buttons-set { padding:20px 30px; border:1px solid #d9dde3; border-width:0 1px 1px; }
 #opc-review .buttons-set p { margin:0; line-height:40px; }
 #opc-review .buttons-set .please-wait { height:40px; line-height:40px; }
+#opc-review .authentication { margin:0 auto; width:570px; }
+#opc-review .warning-message { color:#222; font-weight:bold; text-align:center; padding:10px 10px 0; }
 
 /* Multiple Addresses Checkout */
 .checkout-progress { padding:0 90px; margin:0 0 20px; }
diff --git a/skin/frontend/default/default/css/styles.css b/skin/frontend/default/default/css/styles.css
index 9c7415dbab..cb3fb15c29 100644
--- a/skin/frontend/default/default/css/styles.css
+++ b/skin/frontend/default/default/css/styles.css
@@ -1378,6 +1378,8 @@ tr.summary-details-excluded { font-style:italic; }
 #opc-review .buttons-set { padding:20px 30px; border:1px solid #d9dde3; border-width:0 1px 1px; }
 #opc-review .buttons-set p { margin:0; line-height:40px; }
 #opc-review .buttons-set .please-wait { height:40px; line-height:40px; }
+#opc-review .authentication { margin:0 auto; width:570px; }
+#opc-review .warning-message { color:#222; font-weight:bold; text-align:center; padding:10px 10px 0; }
 
 /* Multiple Addresses Checkout */
 .checkout-progress { padding:0 90px; margin:0 0 20px; }
diff --git a/skin/frontend/default/modern/css/styles.css b/skin/frontend/default/modern/css/styles.css
index f7b762d924..8874dc2654 100644
--- a/skin/frontend/default/modern/css/styles.css
+++ b/skin/frontend/default/modern/css/styles.css
@@ -1331,6 +1331,8 @@ f/********** Product Prices > */
 #opc-review .buttons-set { border:0; padding:15px 30px; }
 #opc-review .buttons-set p { margin:0; line-height:28px; }
 #opc-review .buttons-set .please-wait { height:28px; line-height:28px; }
+#opc-review .authentication { margin:0 auto; width:570px; }
+#opc-review .warning-message { color:#222; font-weight:bold; text-align:center; padding:10px 10px 0; }
 
 /* Multiple Addresses Checkout */
 .checkout-progress { padding:0 90px; margin:0 0 20px; }
diff --git a/var/package/Find_Feed-1.0.8.xml b/var/package/Find_Feed-1.0.8.xml
deleted file mode 100644
index 5eab156428..0000000000
--- a/var/package/Find_Feed-1.0.8.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Find_Feed</name>
-    <version>1.0.8</version>
-    <stability>alpha</stability>
-    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Integration with TheFind shopping engine</summary>
-    <description>Current integration includes managing product feeds from Magento store to TheFind, mapping of Magento Attributes to TheFind structure.</description>
-    <notes>1.0.8</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2010-12-17</date>
-    <time>2010-12-17</time>
-    <contents><target name="magecommunity"><dir name="Find"><dir name="Feed"><dir name="Block"><dir name="Adminhtml"><dir name="Edit"><dir name="Codes"><dir name="Edit"><file name="Form.php" hash="1514d7db604c60dc1723b176ff74ec1b"/></dir></dir><file name="Codes.php" hash="cfabd7a2fa565cc4e201eb6d7e2eadbf"/></dir><dir name="List"><dir name="Codes"><file name="Grid.php" hash="fc7e555780486b7843b3b8ee10d4cdbe"/></dir><file name="Codes.php" hash="d321b1a42a5c7af0788e65a28eed5f5d"/><dir name="Items"><file name="Grid.php" hash="046e29343ccfc1b0d7b02ca7645963e6"/></dir><file name="Items.php" hash="409f1c07816f7e203d5ec6129e2709c9"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="7e0fbe25f560992e1f6639a3d5c28289"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Source"><dir name="Cron"><file name="Frequency.php" hash="2aafece84d3b2a1a386252a3e4c4f023"/><file name="Hours.php" hash="05a361c29436cde4bb1e9d9ea6ef6984"/></dir></dir></dir></dir><file name="Codes.php" hash="a270fbfd8afb815241104612e70159be"/><file name="Import.php" hash="83771be137bc024d62def97ae90a3a24"/><dir name="Mysql4"><dir name="Codes"><file name="Collection.php" hash="6d6974edc597384c9a591d13f77e1673"/></dir><file name="Codes.php" hash="13f52b9a047437e4e989bbd9a2c1c136"/><file name="Setup.php" hash="f53b40fbbaef248fd52be33af906a3f9"/></dir><file name="Observer.php" hash="2cae38701e71a99466d83c030d7567ba"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Codes"><file name="GridController.php" hash="8b5c0c1a3e89d4b3be6ae865099a0e5f"/></dir><dir name="Items"><file name="GridController.php" hash="7dabff14fd9199e1fb01e6e4ae86bd5d"/></dir></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="2b4c259a37a42be60627f81a78a21c39"/><file name="config.xml" hash="2fa2da472f883afa8f8ea1254ee9e645"/><file name="system.xml" hash="fa85aa2b7087e4801528883b50b96d71"/></dir><dir name="sql"><dir name="find_feed_setup"><file name="mysql4-install-0.0.1.php" hash="4fd8b15789abf8b3cc122e70e4cff2c2"/><file name="mysql4-upgrade-0.0.1-0.0.2.php" hash="b7f304fa1765f07bbfb9be85a463642f"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Find_Feed.xml" hash="a75332e3ae92f4b253aca19e60f8c15c"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="find"><dir name="template"><dir><dir name="head"><file name="window.phtml" hash="9d13baa5f42c4415110af2e0461d53d5"/></dir></dir></dir><dir name="layout"><file name="feed.xml" hash="74469083c4d9485dcbafd7409d828542"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Find_Feed.csv" hash=""/></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.5.0.0-alpha1</min><max>1.6.0.0</max></package></required></dependencies>
-</package>
diff --git a/var/package/Interface_Adminhtml_Default-1.5.0.0.xml b/var/package/Interface_Adminhtml_Default-1.5.0.0.xml
deleted file mode 100644
index a0bdad8411..0000000000
--- a/var/package/Interface_Adminhtml_Default-1.5.0.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Interface_Adminhtml_Default</name>
-    <version>1.5.0.0</version>
-    <stability>stable</stability>
-    <license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Default interface for Adminhtml</summary>
-    <description>Default interface for Adminhtml</description>
-    <notes>1.5.0.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:00:50</time>
-    <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="admin.xml" hash="f5de9b172e2959d632af5a5bac396a51"/><file name="adminnotification.xml" hash="eb741bb282633282b858e0548cba1da4"/><file name="authorizenet.xml" hash="ab3c8e22da41bc79cb4f1ebc3d6b6a20"/><file name="bundle.xml" hash="1189f8017a0adec9d1c20850b2e76cc7"/><file name="catalog.xml" hash="37955bd1e6bc058c0817c09cb29122c1"/><file name="cms.xml" hash="67a8d86ffb5b88501a00d37193f456b7"/><file name="connect.xml" hash="1dd99010908a3cc3049f28c1a0d6fc68"/><file name="customer.xml" hash="3fde3b5cc6dbbf3d0660816885617e1e"/><file name="dataflow.xml" hash="d648c2d2d76fdb98dec76cfae5953b7a"/><file name="downloadable.xml" hash="bfa9be70cd6d75cb663796f1a50cfe7a"/><file name="giftmessage.xml" hash="91cb26212b3e4acf9240bc2bea1cf34e"/><file name="googleoptimizer.xml" hash="00dbe14054b96be8ed5f5237cf18e6c1"/><file name="importexport.xml" hash="1a80ca2bda257f8e82780d72c8069062"/><file name="index.xml" hash="f1f6898291f41ce50f6d186b43c0cbac"/><file name="main.xml" hash="771a25b58a801a93a50854bb9b45d824"/><file name="newsletter.xml" hash="ae031f4246c88c80a26c751e16b4efd2"/><file name="pagecache.xml" hash="7a2aed522ea575139dfbe152255b1fd1"/><file name="promo.xml" hash="c356718c11804cfc125469f255f9c8b0"/><file name="report.xml" hash="25e6cb390eec7fdc7b39f7f4dfb0367f"/><file name="rss.xml" hash="ff07bb5a1a6b3e2ebb501c229532d2b6"/><file name="sales.xml" hash="18271a495d01db7114c9d219b43522ec"/><file name="search.xml" hash="b64c008519028d49ab705a969e65d8b1"/><file name="tag.xml" hash="3569993172a766bde89735d21eb1e81e"/><file name="widget.xml" hash="3b3ad7148a07abc6d1ecb099645d8ab9"/></dir><dir name="locale"><dir name="en_US"><file name="translate.csv" hash="735c9ec66d1309f1206294f075fdcdd1"/></dir></dir><dir name="template"><file name="access_denied.phtml" hash="00b329bf4fb8c87014245c197db85636"/><dir name="api"><file name="role_users_grid_js.phtml" hash="939d830a3a5cf4a6e4c878f9888c8dc7"/><file name="roleinfo.phtml" hash="cbf378464dad45ff79e068281ff175c4"/><file name="roles.phtml" hash="5fa69bfde109c62d21bd215ebc8f267a"/><file name="rolesedit.phtml" hash="aa9efc819eeecc2f0338465e2bb680bd"/><file name="rolesusers.phtml" hash="8a0e6f8897f77420a8a4a87739b11078"/><file name="user_roles_grid_js.phtml" hash="29dcef5b0649df538a5232cc9b4afc85"/><file name="userinfo.phtml" hash="7833fea2d2bf35e9c4534e13404f24d5"/><file name="usernroles.phtml" hash="1af89509c4e7c5fe4c00414680bc954e"/><file name="userroles.phtml" hash="ace02a75aed25b91e1ee2afcdd514a83"/><file name="users.phtml" hash="7e2d1dc936e658231c6b0563de360897"/></dir><dir name="authorizenet"><dir name="directpost"><file name="iframe.phtml" hash="ebacdbe54525bc3d9bd2fb1ff6b5c05e"/><file name="info.phtml" hash="95b2749918c75ae7eb2da160eaefd5ad"/></dir></dir><dir name="backup"><file name="left.phtml" hash="8ae2f399a722a364a05c06e71b137d7d"/><file name="list.phtml" hash="6c1af5254eb366dc357c35e34cc64e76"/></dir><dir name="bundle"><dir name="product"><dir name="composite"><dir name="fieldset"><dir name="options"><file name="bundle.phtml" hash="c75041767626bd1ecb8d5c3f56a73a00"/><dir name="type"><file name="checkbox.phtml" hash="852b5ad9b88f91fce45380243935743c"/><file name="multi.phtml" hash="d7a67c4640b1cd61f18922f926567fa2"/><file name="radio.phtml" hash="e510b9e816bb91006f090ec5198223fb"/><file name="select.phtml" hash="08b610b05a6c332a22a01bd9de45185c"/></dir></dir></dir></dir><dir name="edit"><dir name="bundle"><dir name="option"><file name="search.phtml" hash="9e7ddac3c9ffebdb9c5ec8fac605fa76"/><file name="selection.phtml" hash="f198cf2832f1ca473ad5332f39f667a9"/></dir><file name="option.phtml" hash="0c98bde2c62806f9a11d3da41dc14bec"/></dir><file name="bundle.phtml" hash="6301fbf5cb45ecc3223e3dc899d59aeb"/></dir></dir><dir name="sales"><dir name="creditmemo"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="97abed4a59871d75cb7ce26a99b93f96"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="fb201a20a8fec0391ce239aad47c6dc2"/></dir></dir></dir><dir name="invoice"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="7df7f6b37ee0ef7cc1bcd067dcbadd44"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="890f53d013dc1bb96de85374acfac5cc"/></dir></dir></dir><dir name="order"><dir name="view"><dir name="items"><file name="renderer.phtml" hash="005c4bb14040e3d034f4ea4a6f32bdab"/></dir></dir></dir><dir name="shipment"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="2296b42a7ca53db71d51f686e4d4c5fb"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="a18ebf4c82f44de34c0b9bda0c80dacb"/></dir></dir></dir></dir></dir><dir name="catalog"><dir name="category"><dir name="checkboxes"><file name="tree.phtml" hash="42473b45ac92db74c4e90d618744d903"/></dir><dir name="edit"><file name="form.phtml" hash="d8deab7257d1db4342baf604054a438a"/></dir><file name="edit.phtml" hash="60a401128189713a2e2c9e2b89abe19b"/><file name="tree.phtml" hash="e68ae12a970ab4d7e2baab420547e7da"/><dir name="widget"><file name="tree.phtml" hash="3846002e081f1f75e05097d45a31ae5a"/></dir></dir><dir name="form"><dir name="renderer"><dir name="fieldset"><file name="element.phtml" hash="aee08629f249a0606a21e9c8c19c2c95"/></dir><dir name="googleoptimizer"><file name="import.phtml" hash="7921435ceab91244404cb4392d7dd787"/></dir></dir></dir><dir name="product"><dir name="attribute"><file name="js.phtml" hash="0709c6f964bd85b5ff63ebd037ce6e0a"/><dir name="new"><file name="created.phtml" hash="b53829c182c6660c32b20a527c45b621"/></dir><file name="options.phtml" hash="6d28f20fbb51156bb41b9d70b42807ad"/><dir name="set"><dir name="main"><dir name="tree"><file name="attribute.phtml" hash="4688ac6279e12f6a354de033c096fc6b"/><file name="group.phtml" hash="9d0b9b5323b294163294a14c021435dc"/></dir></dir><file name="main.phtml" hash="64005b1da176044b6541de44fbc65cc3"/><dir name="toolbar"><file name="add.phtml" hash="4eb7be1c35d804684362db71d6aaa7ad"/><file name="main.phtml" hash="dcbfa6c38e6748d0bd07ca771a0638b9"/></dir></dir></dir><dir name="composite"><file name="configure.phtml" hash="0568292207ed25c7344bd3b94108d572"/><dir name="fieldset"><file name="configurable.phtml" hash="ae4018d1f282b44d3201c70ceb6e93de"/><file name="custom_options.phtml" hash="0df35c159ec5c3dda0324bcdb1387482"/><file name="grouped.phtml" hash="bf803015e6cd605c1e617028d4512c27"/><dir name="options"><file name="js.phtml" hash="a9c7d95c4b787048e64d0e856275af5b"/><dir name="type"><file name="date.phtml" hash="9064ba5f1b3cd91f9bf35c89fb43c6ed"/><file name="default.phtml" hash="c03de625f91622d50e26fb901db833d4"/><file name="file.phtml" hash="75ecb3c0e8107494be63799ffb09876d"/><file name="select.phtml" hash="8d838b8014e613d6451c7234e2bbd9c4"/><file name="text.phtml" hash="a107fdd7e4595bb2ce9ccd01e51931c7"/></dir></dir><file name="options.phtml" hash="567abd86ddd822f6a68e62c4a984ebe4"/><file name="qty.phtml" hash="eb9b4017ff1ddc511a7b3261958a0f60"/><file name="simple.phtml" hash="5ba50dc4b4af3bbe92f4821d88080f85"/><file name="virtual.phtml" hash="254c40f5716aff29ebc1d575ea1c1b95"/></dir></dir><file name="created.phtml" hash="8e33a6bb8baf25fbc69cceec8c916d42"/><dir name="edit"><dir name="action"><file name="attribute.phtml" hash="ec11f4eb17f7271babd235a90ee972cb"/><file name="inventory.phtml" hash="c28f2313d62f3949776a239a3eab332c"/><file name="websites.phtml" hash="23e71f3050f4984963cc0e9e82ef3dee"/></dir><file name="categories.phtml" hash="10b91cba1006dc01a51fed29bbb80751"/><dir name="options"><file name="option.phtml" hash="b41e1b408ddce2c1def2127d48d7c619"/><dir name="type"><file name="date.phtml" hash="625dbd4ec3ee3963887a137fe1cfa211"/><file name="file.phtml" hash="b93fd2b044c1eafeb29c9314d8c54ccf"/><file name="select.phtml" hash="30fa883dfae529d27e51da8ea9254c36"/><file name="text.phtml" hash="e47803a126623b70e49a4982eaec41d3"/></dir></dir><file name="options.phtml" hash="1fb9eb0d1448a328832ed9eb8d87e2fb"/><dir name="price"><file name="tier.phtml" hash="4458ed09ceb4b7f8c064362923f65580"/></dir><file name="serializer.phtml" hash="710f40878e5f159f3c637a1e4d2a2961"/><dir name="super"><file name="config.phtml" hash="f11c312c1efef492eb95b73fc64f2f30"/></dir><file name="websites.phtml" hash="ad1e2a978dc480f388951cb6a36591fe"/></dir><file name="edit.phtml" hash="69afb56fda9c56c2bb9ced5217a5bc4f"/><dir name="helper"><file name="gallery.phtml" hash="9866542202525e6b8c54594e51393020"/></dir><file name="js.phtml" hash="89853dde6d03f6a1b988d650404c765a"/><file name="price.phtml" hash="10efb40a273b5aad1ce1c12a3b4a8a80"/><dir name="tab"><file name="alert.phtml" hash="63c5f0cf6e8370448f23868807ec6174"/><file name="inventory.phtml" hash="d9b621c539b765d74fa558e9754af676"/></dir><dir name="widget"><dir name="chooser"><file name="container.phtml" hash="b872aae3e34eed3cc50d038f0341782f"/></dir></dir></dir><file name="product.phtml" hash="2c4ba3c30a6b4a17ec4e4c248799e04e"/><dir name="wysiwyg"><file name="js.phtml" hash="c8c93a21e327733551ca5b88161a854f"/></dir></dir><dir name="cms"><dir name="browser"><dir name="content"><file name="files.phtml" hash="9b3158b8a5f3b208726942871e0b06fa"/><file name="newfolder.phtml" hash="5a21a1b7a162ac3a1d07bc06f9b2dafc"/><file name="uploader.phtml" hash="5833bc7da0f676f7003e64a0f2e008cb"/></dir><file name="content.phtml" hash="428b651c36096ddc90c0ef88f1ab3dcf"/><file name="js.phtml" hash="53df193d96311bf3e9fcd1493bf2b508"/><file name="tree.phtml" hash="3a87b75ce274f9211a13c059a7744af3"/></dir><dir name="page"><dir name="edit"><dir name="form"><dir name="renderer"><file name="content.phtml" hash="b340643f247d91634d9c7fe57d1dd4c0"/></dir></dir></dir></dir></dir><file name="coming.phtml" hash="3a15a2c9fb5545fb714671042f67a4b4"/><dir name="connect"><dir name="extension"><dir name="custom"><file name="authors.phtml" hash="e298168e07df66da72291042c7fd23fc"/><file name="contents.phtml" hash="2751c7465f5b1d89c1c143e6ebd2fb32"/><file name="depends.phtml" hash="8751ddefe753825f8953ad01f12fd1e9"/><file name="load.phtml" hash="cbe1f553e84501a91356b4018b9a2f03"/><file name="package.phtml" hash="e9a2816426a0d2add024891b790bbf6f"/><file name="release.phtml" hash="2ece6f2dbb12a5282c137a67fac0663c"/></dir></dir></dir><dir name="customer"><dir name="edit"><file name="js.phtml" hash="9a2a312905555dd71aef0531fe9f4657"/><dir name="tab"><dir name="view"><dir name="grid"><file name="item.phtml" hash="fa3da32790b2b84476e5feada903998f"/></dir></dir></dir></dir><file name="online.phtml" hash="6071853bbdde6babc457bf73270af914"/><dir name="tab"><file name="addresses.phtml" hash="ecc8027fe6500367e133048bfb7fc7d3"/><file name="cart.phtml" hash="a4e4d318d06b93593291ed175ef0068c"/><file name="newsletter.phtml" hash="099034309adc8ca3550112750b82e022"/><dir name="view"><file name="sales.phtml" hash="fb32de7298a99f5e3b5e18881a60fd99"/></dir><file name="view.phtml" hash="e12c5b20cc5bafbf02948b4b2477f6d5"/><file name="wishlist.phtml" hash="1a543fad48c54e6930c2bd907ca9c065"/></dir></dir><dir name="dashboard"><dir name="graph"><file name="disabled.phtml" hash="569e900b4436ffc2c8c62afd9e041e56"/></dir><file name="graph.phtml" hash="d9d3e27b92027e9233c7d2ea12ed5d0a"/><file name="grid.phtml" hash="a1b39410cd160160d14c27c4f1c04a5a"/><file name="index.phtml" hash="4cbc8c78e00895fe220207b64cabbcd5"/><file name="salebar.phtml" hash="21916240d1c905b9836d30622742bdcb"/><file name="searches.phtml" hash="8ae47cce6b1b69177e7b9838a8dade9c"/><dir name="store"><file name="switcher.phtml" hash="418b623025e19694d25c282a5cc9d0a4"/></dir><file name="totalbar.phtml" hash="e5ffa3a9866180693ca2d5fafdfa0cf3"/></dir><dir name="directory"><dir name="js"><file name="optional_zip_countries.phtml" hash="09d600499ad99eb85bdd3ea915ba8844"/></dir></dir><dir name="downloadable"><dir name="product"><dir name="composite"><dir name="fieldset"><file name="downloadable.phtml" hash="cd089c8fc32776a37457192f9aa542bf"/></dir></dir><dir name="edit"><dir name="downloadable"><file name="links.phtml" hash="eb63959565bf5f41eebdc15649c41c6f"/><file name="samples.phtml" hash="63bd3398e31e43b3ae13f1829c8f0994"/></dir><file name="downloadable.phtml" hash="9479c50452a2c3e835bb02d66989c182"/></dir></dir><dir name="sales"><dir name="items"><dir name="column"><dir name="downloadable"><dir name="creditmemo"><file name="name.phtml" hash="064113e67bdac44a50f43322ece79e62"/></dir><dir name="invoice"><file name="name.phtml" hash="5b42527504a5db32a78d77e32dd32715"/></dir><file name="name.phtml" hash="a37564dd12fdfb71f0005a83ecacf844"/></dir></dir></dir><dir name="order"><dir name="creditmemo"><dir name="create"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="18c1b93ab6f63ef113fab1cb0f5ca650"/></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="5f3ac7aa05f7f8cf36cdcb8aaa50f2c6"/></dir></dir></dir></dir><dir name="invoice"><dir name="create"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="20228cf30d45c20f3ce4aba7c0432f0f"/></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="aad00f7521ff1e8c04871faf4c7229fe"/></dir></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="e3ace6d5413751d723408a430c0042ad"/></dir></dir></dir></dir></dir></dir><dir name="eav"><dir name="attribute"><dir name="edit"><file name="js.phtml" hash="4688ac6279e12f6a354de033c096fc6b"/></dir></dir></dir><dir name="email"><dir name="order"><file name="items.phtml" hash="066e7da569efda786114690627b3121e"/></dir></dir><file name="example.phtml" hash="a24220848faac5107a832b8fe8b0e4d3"/><file name="forgotpassword.phtml" hash="951b3a47e8d5f35863eb61ba460a2cac"/><file name="formkey.phtml" hash="f94f585df0afcde3b36e318ce0729a30"/><dir name="giftmessage"><file name="form.phtml" hash="17eaaa512f4b679c8abb43858f09ed19"/><file name="giftoptionsform.phtml" hash="05499d024d1a00b7bc448a34967edbef"/><file name="helper.phtml" hash="c0666de1722c6764b2f6cc1e840a172f"/><file name="popup.phtml" hash="986468518e7fe9bb1dc117063fdd67ec"/><dir name="sales"><dir name="order"><dir name="create"><file name="giftoptions.phtml" hash="882ca9456c8b921abf7ccf059ddd1224"/><file name="items.phtml" hash="ad5b5aadf5afbfc692b44d5258c3503c"/></dir><dir name="view"><file name="giftoptions.phtml" hash="811ccab3e4ec1d930736bfd7da47d7b7"/><file name="items.phtml" hash="d70296c8a701cc36de1e1a7588bf4a58"/></dir></dir></dir></dir><dir name="googlebase"><file name="captcha.phtml" hash="15809605b5e08cf34d3b88e30fa1ef48"/><file name="items.phtml" hash="f3d367e07bf660df5d9c6867d2ee6f7c"/><dir name="types"><dir name="edit"><file name="attributes.phtml" hash="cc7a8cf44388f3f3b8a345c6ddb7475f"/></dir></dir></dir><dir name="googleoptimizer"><dir name="cms"><dir name="edit"><dir name="renderer"><file name="conversion.phtml" hash="0eddf2c27df0881c799da1d568c90b06"/></dir></dir></dir><file name="js.phtml" hash="c20190f9d688ff2a04de74c4ce0c4602"/></dir><dir name="importexport"><file name="busy.phtml" hash="158074f8b51ab4de87daaf0d07768f64"/><dir name="export"><dir name="form"><file name="after.phtml" hash="e2f11396a703f206b393a28251bf7ca3"/><file name="before.phtml" hash="d80971ec759c88321d2757728ebbd529"/></dir></dir><file name="faq.phtml" hash="eaa4b099a4c344189f8ec7f04470ff97"/><dir name="import"><dir name="form"><file name="after.phtml" hash="b8e4cdadca9901b0b52de6ceff99947d"/><file name="before.phtml" hash="bd72ed74c35cdb897a4701a9dcbc1907"/></dir><dir name="frame"><file name="result.phtml" hash="10c829383e27b7a3bfcc9018980a4b02"/></dir></dir></dir><dir name="index"><file name="notifications.phtml" hash="786eea63663a3a6134b350d0140520cd"/></dir><file name="login.phtml" hash="b87d527afe7bafd142a9ccff91b8a415"/><dir name="media"><file name="editor.phtml" hash="d8c24e468077f00fde79acac048b445d"/><file name="uploader.phtml" hash="bc27d85ed884f99e036c5edae22a9c98"/></dir><dir name="newsletter"><dir name="preview"><file name="iframeswitcher.phtml" hash="46385c30415e8b73c239fd182a0a7437"/><file name="store.phtml" hash="618ca3b969eb8cc1d6fea7b611d1d594"/></dir><dir name="problem"><file name="list.phtml" hash="15d5dda3916a89635a4b2abe47a946b0"/></dir><dir name="queue"><file name="edit.phtml" hash="790abb0176a9492936340291ac63418e"/><file name="list.phtml" hash="9a113d8c611e76f170e4beddd4b11e84"/><file name="preview.phtml" hash="39f0021795c096ce7ba1984e2f41f01a"/></dir><dir name="subscriber"><file name="list.phtml" hash="b09c6b1b7250eadd3eb6fdc627fb22c3"/></dir><dir name="template"><file name="edit.phtml" hash="47a90783afad7aca47e40d8fd8310892"/><file name="list.phtml" hash="d01e6adea24c06d35ca7dc5879b06670"/><file name="preview.phtml" hash="39f0021795c096ce7ba1984e2f41f01a"/></dir></dir><dir name="notification"><file name="baseurl.phtml" hash="a6483031176fa52766a6b3f717e2fada"/><file name="security.phtml" hash="5fa6dee4fef240b9d04641d2d2e32326"/><file name="survey.phtml" hash="ab5995b125621bd50462f0f45a3c3d0f"/><file name="toolbar.phtml" hash="e38c1cab92d21e0e9c5ebb80b0709b61"/><file name="window.phtml" hash="ee70ef584fab0f0d20944b4f53e0b7bc"/></dir><file name="overlay_popup.phtml" hash="e80aa521aec9a4abce32bcc2becf2951"/><dir name="page"><file name="footer.phtml" hash="e5ab0c830fd4a71c836e7ce33de3ca12"/><file name="head.phtml" hash="9313b80d7c42fa7bbc038aae5444968a"/><file name="header.phtml" hash="9e2d839aeebf6652d661a97018f943bf"/><dir name="js"><file name="calendar.phtml" hash="2adf55ed11baafb04ce244ac58fbd5d7"/><file name="translate.phtml" hash="63574dc35a2257e553a9e9c9d46addbc"/></dir><file name="menu.phtml" hash="731f16314c3c1f893eb2e3f142fa0d80"/><file name="notices.phtml" hash="b59d326a3c601b72960b261b5e74999f"/></dir><file name="page.phtml" hash="a58a2acd8c77c097a53e3b345eccf02e"/><dir name="pagecache"><dir name="cache"><file name="additional.phtml" hash="ad44648889c4c67ecfaba9a1c0f3e00d"/></dir></dir><dir name="paygate"><dir name="form"><file name="cc.phtml" hash="9fc9a5a0c8f00c14082a17e98643d2f0"/></dir><dir name="info"><file name="cc.phtml" hash="9483b1e6faeb46a0a6c1dd1e0d59cb7f"/><file name="pdf.phtml" hash="1457e4b16b4b2978a1238098f5d6c6b3"/></dir></dir><dir name="payment"><dir name="form"><file name="cc.phtml" hash="fee5f81b82d5161ecfd2b549666ae438"/><file name="ccsave.phtml" hash="5a644c1328a53c258bc62715d003605f"/><file name="checkmo.phtml" hash="419d0d80aef549c51826e92795a7761c"/><file name="purchaseorder.phtml" hash="3898d5b285d0c5c03d6968953399f2ef"/></dir><dir name="info"><file name="checkmo.phtml" hash="c74359347238ec5f004b256dc8997b97"/><file name="default.phtml" hash="ce3c565c9cdae42debacb267e2c9a9ea"/><dir name="pdf"><file name="checkmo.phtml" hash="01d5ef36f93d4c8e2d4511483c07ce4a"/><file name="default.phtml" hash="80f206fa782ad0e8c9f3cae44aba1199"/><file name="purchaseorder.phtml" hash="a0ea5dab309493c0adeb2715cfdb1590"/></dir><file name="purchaseorder.phtml" hash="1505670c5b9d35ca49c92501614e0012"/></dir></dir><dir name="paypal"><dir name="system"><dir name="config"><file name="api_wizard.phtml" hash="8ff6c110f4780b8562be26eaf0856666"/><dir name="fieldset"><file name="global.phtml" hash="084a0203fb3c116d78a0a071ebecb8be"/><file name="hint.phtml" hash="4658b4ba58414d8efd61282cb775cf65"/><file name="store.phtml" hash="566ca955c87ac1ccdab18d7864583e46"/></dir><dir name="payflowlink"><file name="info.phtml" hash="960b490c04cd0cd6a5c2faa7e48f1755"/></dir></dir></dir></dir><dir name="permissions"><file name="role_users_grid_js.phtml" hash="c8a117889d579429aee7252a4e742fef"/><file name="roleinfo.phtml" hash="66849f5b8249a9b13fc38492cd648b27"/><file name="roles.phtml" hash="5fa69bfde109c62d21bd215ebc8f267a"/><file name="rolesedit.phtml" hash="e9f5e1e811816b25709ef48c4dfa89df"/><file name="rolesusers.phtml" hash="8a0e6f8897f77420a8a4a87739b11078"/><file name="user_roles_grid_js.phtml" hash="9267240bc35a6f42f6ade61b5575b137"/><file name="userinfo.phtml" hash="7833fea2d2bf35e9c4534e13404f24d5"/><file name="usernroles.phtml" hash="1af89509c4e7c5fe4c00414680bc954e"/><file name="userroles.phtml" hash="ace02a75aed25b91e1ee2afcdd514a83"/><file name="users.phtml" hash="7e2d1dc936e658231c6b0563de360897"/></dir><dir name="poll"><dir name="answers"><file name="list.phtml" hash="56eeb174a2ea8be28131efa7e1b226c1"/></dir></dir><file name="popup.phtml" hash="db9e90a1722dbf976a3ce962a54f040b"/><dir name="promo"><file name="fieldset.phtml" hash="37025bc9ffccbed0d939115a02f9d50a"/><file name="form.phtml" hash="adc391e6c265b2a33c317a623d1b3768"/></dir><dir name="rating"><file name="detailed.phtml" hash="0e00c87d97a12098c84fa7e3660d1009"/><file name="options.phtml" hash="8b0e471d9938b601890753491bf8efe2"/><dir name="stars"><file name="detailed.phtml" hash="8c87887840d057aed231530a324f9e41"/><file name="summary.phtml" hash="f2f78783432c623581e2c63e165fffa2"/></dir></dir><dir name="report"><dir name="grid"><file name="container.phtml" hash="4bcd8425d5c7adbec190c5fe236254e4"/></dir><file name="grid.phtml" hash="ec58fe3193dac43a3c9730ca9dd1ac14"/><dir name="refresh"><file name="statistics.phtml" hash="31a05ce83b4e4d1c7597cffc8de3d806"/></dir><dir name="store"><dir name="switcher"><file name="enhanced.phtml" hash="a199110de50690d5cdd631030ea9f785"/></dir><file name="switcher.phtml" hash="7a45705cf2fb54825fe12b466a231746"/></dir><file name="wishlist.phtml" hash="4270c69c087aa2997403de844776936c"/></dir><dir name="review"><file name="add.phtml" hash="365355c10f468daea37411a6b33ac7e6"/></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="form.phtml" hash="b02c8a055c485bb0eb1cf4b95681a324"/><dir name="view"><file name="form.phtml" hash="99c7ee0fb979f52987ea264e0112981f"/><dir name="tab"><file name="info.phtml" hash="ef7a86fae76d9a6f334094e1e86272f1"/></dir></dir></dir></dir><dir name="items"><dir name="column"><file name="name.phtml" hash="146440283893485f022dd1231841e882"/><file name="qty.phtml" hash="85c7096b11d53b6ecbc58bc76920dc9e"/></dir><dir name="renderer"><file name="default.phtml" hash="3361ff39a97c54d386d1e24cda5fe971"/></dir></dir><dir name="order"><dir name="address"><file name="form.phtml" hash="6af193e437847771bd0eb0327b62c3ea"/></dir><dir name="comments"><file name="view.phtml" hash="bd772b98baeb62e4bd03d3ad80a03fb7"/></dir><dir name="create"><file name="abstract.phtml" hash="74f7ff9c96ecdfa095f64349f3d64310"/><dir name="billing"><dir name="method"><file name="form.phtml" hash="928c8221d9f87d32f6f67b925bb18fd3"/></dir></dir><file name="comment.phtml" hash="bbc76aea2dbed2bf1132cf3bd44063d2"/><dir name="coupons"><file name="form.phtml" hash="e1962ca03920c832a5b6fa7e0e5ac376"/></dir><file name="data.phtml" hash="7ec8a3b089188d001c182dc99d3db578"/><dir name="form"><file name="account.phtml" hash="81a30a5dc181bdffdd0a0fc9bbe97e46"/><file name="address.phtml" hash="d37e4af23219d7d68c6d715e6a930fe6"/></dir><file name="form.phtml" hash="4cd7aeaef95e5f964c61787b5c5a177c"/><file name="giftmessage.phtml" hash="9b8ea9ad599005ba7e7a3401a1a290f7"/><dir name="items"><file name="grid.phtml" hash="9d9750c4325f5c5f272601014de64688"/></dir><file name="items.phtml" hash="b890cc070f43e185e3e925e71802c0c8"/><file name="js.phtml" hash="2a891c2e25ccb37a791a2db3aee2f3f8"/><dir name="newsletter"><file name="form.phtml" hash="22f7e2070e55d6af4c6e561551e61097"/></dir><dir name="shipping"><dir name="method"><file name="form.phtml" hash="735f22dbc0c9a2fd8930a3f25b2f65f8"/></dir></dir><dir name="sidebar"><file name="items.phtml" hash="9ffbb2dc553fe940857e4677236aa5d5"/></dir><file name="sidebar.phtml" hash="3af67acfaeb2f48c39d260a2b32470a1"/><dir name="store"><file name="select.phtml" hash="584ad255c246c03687c8d1c8ef0caa14"/></dir><dir name="totals"><file name="default.phtml" hash="a2d07415c0457d7e260c217b353b8702"/><file name="grandtotal.phtml" hash="c12698af649f52f3cb93875bd875ac65"/><file name="shipping.phtml" hash="933f0257431767c94323fa72be17d203"/><file name="subtotal.phtml" hash="a0d7d8a4cbab99ff01cb8d50cfaf41cf"/><file name="tax.phtml" hash="af1884d8a9ae77be95914137e3a15d26"/></dir><file name="totals.phtml" hash="f0c1bb9df0ad492a24c3e965d2f0ccfb"/></dir><dir name="creditmemo"><dir name="create"><file name="form.phtml" hash="b723e66ea09ca555a297f83c2b9bbaa0"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="7fed3827f0440e9667da905d5160e0f3"/><file name="default.phtml" hash="0d147ea5f48847d6da909d1d196d0a3c"/></dir></dir><file name="items.phtml" hash="1f1786f517fceed7371e29d15b48996d"/><dir name="totals"><file name="adjustments.phtml" hash="524aa669fe01453abeb2a00e6ae05ada"/></dir></dir><dir name="view"><file name="form.phtml" hash="2e9f83e2e05e0546de44314d77dce3a1"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="340b2b3b67e8814d01a29c782e780968"/><file name="default.phtml" hash="ed3b21e1f949f2e8064129977e3b8657"/></dir></dir><file name="items.phtml" hash="85450710e5b34759c7f0482b9d10a37c"/></dir></dir><file name="giftoptions.phtml" hash="7c64c619e4b43b72ef39c4025097127c"/><dir name="invoice"><dir name="create"><file name="form.phtml" hash="11873b4eab4a146f675d1d24045e9b3a"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="abd09d6d1f8f75512b5df36d096324a3"/><file name="default.phtml" hash="670ed81e1d3224aed5e5efd2b512330f"/></dir></dir><file name="items.phtml" hash="b9de80dabf4d7747021fec9424a6744f"/><file name="tracking.phtml" hash="2fb3decfb28ef15c6c47433192c2546b"/></dir><dir name="view"><file name="form.phtml" hash="48a113b86ddf6f51938e91f609dc7aa9"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="ff49cce5c32b2bbf2fe2c9e7e7eccee9"/><file name="default.phtml" hash="b7c7cbf95d99b4ffbe71a303c1fe862a"/></dir></dir><file name="items.phtml" hash="7e2bfbb7581e887d0726651597191a53"/></dir></dir><dir name="shipment"><dir name="create"><file name="form.phtml" hash="0dd55ee6088a54080b3285aa9f7f24eb"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="fc7c6142f48b24945cb0404f681b3709"/><file name="default.phtml" hash="5631f2f22ebcaf3105b3ce733eaf285a"/></dir></dir><file name="items.phtml" hash="ffd9a6aa12adec35fb16e48ffe1ff2f3"/><file name="tracking.phtml" hash="71ccb02c0ca90c774381478664875337"/></dir><dir name="tracking"><file name="info.phtml" hash="86a73be0cabcd0827331d223d9975e3f"/></dir><dir name="view"><file name="form.phtml" hash="d7d167149c29baefb3174310db0db05b"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="c6ab6e4816b404bb2c7deee645044049"/><file name="default.phtml" hash="84d5ff87893a64886eab7acef6fe1d7b"/></dir></dir><file name="items.phtml" hash="af138e7b27691aac806d61b7437e8716"/><file name="tracking.phtml" hash="6eb7350ef8c61304f548bf1f549a91b7"/></dir></dir><file name="totalbar.phtml" hash="364fd5bc4b909c02851d5e07a758d443"/><dir name="totals"><file name="discount.phtml" hash="20e97fe8b6c4c039596f417a6f498545"/><file name="due.phtml" hash="767b949509c67355bf69419ed4a17e83"/><file name="footer.phtml" hash="fef6c53cc74d5f8a6ef18ae4572e5a0a"/><file name="grand.phtml" hash="d9a68f13b2125d77c010944e0548faef"/><file name="item.phtml" hash="ca823ab8c9b2f16063e3cdf81fda5bc3"/><file name="main.phtml" hash="af5bedccd80d881ef56daa18b133ae9c"/><file name="paid.phtml" hash="53e9846384301213120b15eeb7c7a3d1"/><file name="refunded.phtml" hash="edaaf7fa2b9d9ffe39712acf43027849"/><file name="shipping.phtml" hash="1b08d7e216c7833f5688c79b5462d309"/><file name="subtotal.phtml" hash="1ac91776ac39f546dded244ebe3ac4a0"/><file name="tax.phtml" hash="c4e7894e6efa149f033342fbeb6f6728"/></dir><file name="totals.phtml" hash="79de266717aa0b5bf586c2d00eb29771"/><dir name="view"><file name="form.phtml" hash="15e0d72872c79176cbe9d3bac250de3f"/><file name="giftmessage.phtml" hash="5eb1c4ce6b9c580793ec7eabe65bafee"/><file name="history.phtml" hash="6e723f2e5f9369871948ebac920a96f9"/><file name="info.phtml" hash="b3e8397599b7b3f6a61118d8c29f2908"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="c8b05a3a9f9672e56f61227519f752e6"/></dir></dir><file name="items.phtml" hash="a5b74aea98b978c5d3163385fce611d2"/><dir name="tab"><file name="history.phtml" hash="1366f0a892c49dfddb15310bacdf1727"/><file name="info.phtml" hash="fd615606f0c49429432a6fb1b3beae4d"/></dir><file name="tracking.phtml" hash="e94c09381d9341c3d463fc02fcf259c2"/></dir></dir><dir name="payment"><dir name="form"><dir name="billing"><file name="agreement.phtml" hash="57d78e3cc6446c6c9f258d7b60d891aa"/></dir></dir></dir><dir name="recurring"><dir name="profile"><dir name="view"><file name="info.phtml" hash="fcf32c0d401cea3e06060db0b02bee34"/></dir><file name="view.phtml" hash="10b146b73105b63440fb091ab8551396"/></dir></dir><dir name="transactions"><file name="detail.phtml" hash="d733b875adcbd8650bf73c85fd0ede66"/></dir></dir><dir name="store"><dir name="switcher"><file name="enhanced.phtml" hash="0129e010b790248eb19df51d804f0b70"/></dir><file name="switcher.phtml" hash="9dd179ca8abc52c05ff5eaeef170c45a"/></dir><dir name="system"><file name="autocomplete.phtml" hash="fe3c284e4958ccf01c66b4ef427b4fe7"/><dir name="cache"><file name="additional.phtml" hash="6048c1979d3f377ce3b889fc770a61db"/><file name="edit.phtml" hash="02e5d2590b9b85f0323259e9c609664e"/><file name="notifications.phtml" hash="0f812683232e4e7d638a715bd7a3f741"/></dir><dir name="config"><file name="edit.phtml" hash="02662d4332ddb36a90178dfba7c138a8"/><dir name="form"><dir name="field"><file name="array.phtml" hash="c339ad1179e5c6011aa3aac7bb9654bd"/></dir></dir><file name="js.phtml" hash="b4434874a913af63667d88e03ddb8e25"/><file name="switcher.phtml" hash="f4455351e2027efc714e850bbe8cb210"/><dir name="system"><dir name="storage"><dir name="media"><file name="synchronize.phtml" hash="4a62140ca196e3dcae5ffd7ce0eb424b"/></dir></dir></dir><file name="tabs.phtml" hash="1cec6fdc76f439a317f3b8d49bc402a6"/></dir><dir name="convert"><dir name="profile"><file name="process.phtml" hash="d92d7f795a396b72785008e956681415"/><file name="run.phtml" hash="8314278f7c72dd49f72bd1d23260f360"/><file name="upload.phtml" hash="0376f43508fe8248beade715e50b6380"/><file name="wizard.phtml" hash="97e2ec8ab2a390205a58eba57beb3a8a"/></dir></dir><dir name="currency"><dir name="rate"><file name="matrix.phtml" hash="4680b23304a96926ff801e5652d73598"/><file name="services.phtml" hash="c6a7b7435ad7c4b8eeaceb86cf8d30f4"/></dir><file name="rates.phtml" hash="5caf2274df2095962382d65d512fac92"/></dir><dir name="design"><file name="edit.phtml" hash="9b91fa0e4e8cb6cbef4b9bd1b96acb04"/><file name="index.phtml" hash="fe743f0d6c1ce6359aecc687e51ca712"/></dir><dir name="email"><dir name="template"><file name="edit.phtml" hash="a1c4fcfe19ede1c3825e751961088831"/><file name="list.phtml" hash="a2b68ef7f58639a2962158798d5d0daa"/><file name="preview.phtml" hash="ee388f79fc0bc24478ca00bba8658c3a"/></dir></dir><file name="info.phtml" hash="86ee738ef1e8d71fb71dd5727edef6e8"/><dir name="shipping"><file name="applicable_country.phtml" hash="7b4c504bac0a8092a012545ded159550"/><file name="ups.phtml" hash="85536d183b506b5f92898c2d12a8f132"/></dir><dir name="variable"><dir name="form"><dir name="renderer"><dir name="fieldset"><file name="element.phtml" hash="7eb0bbdd1cbea73a9daf78d069d04857"/></dir></dir></dir><file name="js.phtml" hash="39fc77b7721ebce75be19886a5fac94e"/></dir></dir><dir name="tag"><dir name="edit"><file name="container.phtml" hash="73a2b4c78610ba875bfff0cb04891deb"/><file name="serializer.phtml" hash="710f40878e5f159f3c637a1e4d2a2961"/></dir><file name="index.phtml" hash="e8c6f9cad76caa85721b32c5e97b0a7c"/></dir><dir name="tax"><dir name="class"><dir name="page"><file name="edit.phtml" hash="a31ab41449b661a4cbc265ccf2e9209b"/></dir></dir><file name="importExport.phtml" hash="486cd1eb93d53c2d985373e06de250a5"/><dir name="rate"><file name="form.phtml" hash="85ef4c6c152bd3deb2d4b16acfa3996d"/><file name="title.phtml" hash="7cbd7d5498e9676d408c4c00af67a3f2"/></dir><dir name="toolbar"><dir name="class"><file name="add.phtml" hash="d30cb745160d7daac1247736f986e2e5"/><file name="save.phtml" hash="0a8c5ffb490869b1d87fa0cc41991d68"/></dir><dir name="rate"><file name="add.phtml" hash="09a66534c2c0efcca3c8ae9fc18a6778"/><file name="save.phtml" hash="d4153aac56a2ddb541db6eee8c256cf0"/></dir><dir name="rule"><file name="add.phtml" hash="529d088194fd5bfcbe693eec67487851"/><file name="save.phtml" hash="8ff9dc78e63b36864d584483fd4092f6"/></dir></dir></dir><dir name="urlrewrite"><file name="categories.phtml" hash="aa5fb295ffbf5bb90f56faac8ec5dfc6"/><file name="edit.phtml" hash="cbcd5e1c6ca95b6725df38dddc5324d1"/><file name="selector.phtml" hash="3edb0b1907e76eeaf0ca07da52540d5b"/></dir><dir name="weee"><dir name="renderer"><file name="tax.phtml" hash="d2269d1a42fb106c0065883c6690ba1a"/></dir></dir><dir name="widget"><file name="accordion.phtml" hash="46ae9affe7292c62846c5c144374bbc5"/><file name="breadcrumbs.phtml" hash="071f7a174f1eaf4ed56bbc0f70505570"/><dir name="form"><file name="container.phtml" hash="8a98c04f8cc122d9e946f9d8a1f9e31a"/><dir name="element"><file name="gallery.phtml" hash="ffffa8528f3ce87d4febec4db3785354"/></dir><file name="element.phtml" hash="e33db462f7313d6f5e3bb0d78a6b0925"/><dir name="renderer"><file name="element.phtml" hash="0cd7bd5e5889d5d8946b75f3213057ab"/><dir name="fieldset"><file name="element.phtml" hash="0d81a7355a799579e3113dd9801ebd54"/></dir><file name="fieldset.phtml" hash="33e785de15afc7593bc94778a2843b8a"/></dir></dir><file name="form.phtml" hash="196c74aecb17e6594a92ab0404f44456"/><dir name="grid"><file name="container.phtml" hash="30f0b0287b8a607871c458b40ad6c711"/><file name="massaction.phtml" hash="9dfdcf4d083fc2acbe756dff1f761967"/><file name="serializer.phtml" hash="e9370d02452c8dbd7debb8e79bf6f900"/></dir><file name="grid.phtml" hash="7f63715efa09f131c948073aa3a426a6"/><dir name="instance"><dir name="edit"><file name="layout.phtml" hash="45d93cd360b716517d1e88f0908eb773"/></dir><file name="js.phtml" hash="d7cc7ad6bdd6cdaa53046e8bccac6644"/></dir><file name="tabs.phtml" hash="4f300778542754e891622294f4bceb34"/><file name="tabshoriz.phtml" hash="ef738abe3fb003fcd01e3267a74301c9"/><file name="tabsleft.phtml" hash="38a834680a7064123549f354669a9db1"/><dir name="view"><file name="container.phtml" hash="9d0f4037899bd801855f7b9f739ac2b2"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><file name="below_ie7.css" hash="b2bf3a91f389f2ea7912765a814ce10f"/><file name="boxes.css" hash="30a39f4046f3daba55cfbe0e1ca44b4c"/><file name="custom.css" hash="30ed634c4e5d7521cf9961c880c3cba4"/><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><file name="ie7.css" hash="15db0c436a5438265a91b2c1e4ac4626"/><file name="iestyles.css" hash="edb66cedafe107711cf72e73e4a76c23"/><dir name="images"><file name="accordion_close.gif" hash="875409122fc82f5f6705e20dd801fd3d"/><file name="accordion_close.png" hash="6213698b5f69bb2907a5c7bb94b5fe8d"/><file name="accordion_open.gif" hash="d9d50e220b0b676094c6134a9708194e"/><file name="accordion_open.png" hash="9fbc3aba23ce5e0465e4d1cf3f6a7aee"/><file name="add_btn_icon-disabled.gif" hash="c8f6a5cfb455ef121efb56a747821f82"/><file name="add_btn_icon.gif" hash="7300097305b577ee564dc49102822d16"/><file name="address_list_li.gif" hash="79b917b514e35ce0a7833a5e268fd9f7"/><file name="address_list_on_arrow.gif" hash="3a2884ddcc87ebd48883662530b9de1b"/><file name="address_list_over_arrow.gif" hash="e826883c71b1184bd4f29433e39c18ad"/><file name="address_list_over_bg.gif" hash="56291480cc89de9d817205a5f23b66dd"/><file name="ajax-loader-tr.gif" hash="1ae32bc8232ff2527c627e5b38eb319a"/><file name="ajax-loader.gif" hash="e2a38f1e23288e315af3c55416bc1ce7"/><file name="application_view_tile.gif" hash="f595a133bf466cb91be23d9686fe6281"/><file name="arrow_sort_move.gif" hash="f5ac151a2b0cb1f07d6e771b8aee0ea7"/><file name="bg_collapse.gif" hash="2333c68e38163ed4656da82b9bcf362b"/><file name="bg_create_order_totals.gif" hash="ff6ab75c050b959c539cc6a6fdff2934"/><file name="bg_notifications.gif" hash="a365594725a83585d989f722b3d8c458"/><file name="bkg_btn-close.gif" hash="df3f2332f0bad01e031deb22b81f630c"/><file name="bkg_btn-close2.gif" hash="822457d78fb3c21dc12e9777d83eb4f1"/><file name="blank.gif" hash="5722d7bd0f1e1379d0a2005a0a9ea401"/><file name="box_bg.gif" hash="4c501bd6db9d361c18780f106a809b03"/><file name="breadcrumb_bg.gif" hash="72c4adf6c75b4640ca8f7cadffa42266"/><file name="btn_add-image_icon.gif" hash="1d42210fd29fc534d9ed6b41e811d40f"/><file name="btn_add-variable_icon.gif" hash="a2db02e318d107d5b57b444c8d80b8f8"/><file name="btn_add-widget_icon.gif" hash="b4f66ca7f6097fbafd672e0b3f076ef4"/><file name="btn_add-widget_icon2.gif" hash="467acd3a14fb8be37191f5d2ec5a5b13"/><file name="btn_back_bg.gif" hash="8be512788b8044fe31aa8d00cc16ba7b"/><file name="btn_bare_bg.gif" hash="ddbbab8c0d201c3e502d50e7d4a3d64b"/><file name="btn_bg-disabled.gif" hash="079971a9d2c385fe353d35716ec9f26b"/><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="btn_bg.png" hash="6e3b7003381f919e8f6533444afaa978"/><file name="btn_cancel_bg.gif" hash="fcb3506858fcfa8d1778b0683dc89f54"/><file name="btn_delete_bg.gif" hash="ad740d0c16f2f6603c8ef023004d6539"/><file name="btn_go.gif" hash="1bd787868713767cc205e2ee25e41f62"/><file name="btn_login.gif" hash="79fa32d49d3f4e39d3fbf8327f9229e1"/><file name="btn_on_bg.gif" hash="709cf5b0be137db1ef8427688503bf37"/><file name="btn_over_bg.gif" hash="f91641168454c03d1fa72731ec97a2b3"/><file name="btn_show-hide_icon.gif" hash="0238c509b33ba56c25df9513bb48f804"/><file name="btn_task_bg.gif" hash="5e0594bd9cbfcc1e32ffa918d7f9c812"/><file name="button-close.png" hash="04d0907b2d7fc3240693497b199f64f5"/><file name="cancel_btn_active_bg.gif" hash="91ce403d286eef2b4e0c13733875882f"/><file name="cancel_btn_bg.gif" hash="26749cf4949ac27c30f597434d3bde65"/><file name="cancel_btn_icon.gif" hash="97e0cd94ed31d6f2a1181f627e60e9a3"/><file name="cancel_btn_over_bg.gif" hash="45eb4e883b17375961672f5390387c31"/><file name="cancel_icon.gif" hash="70a23b78353f0a7b9b118a937fcb7ea9"/><file name="config_tab_dt_bg.gif" hash="a33f71077ca4078caa794cae01d9fca7"/><file name="dashboard-close.gif" hash="5ae5afd61e937fcd2d5b84641255ee4d"/><file name="db-graph-bg.gif" hash="5d76efb7c3244f5684df2566782124ea"/><file name="db-graph-bottom-bg.gif" hash="b58ced87a38a10891106329ae882aa1c"/><file name="db-graph-line-bg.gif" hash="f16bb08e040c2c0a3e23b3f35c54b79b"/><file name="db-graph-line2-bg.gif" hash="744ebfdba20d050f4d252afc216394be"/><file name="db-graph-x-bg.png" hash="d5c26510718a78d22083916d80ef7a22"/><file name="db-header-bg.png" hash="3976cb6351e167686a501a85cf3a68e9"/><file name="db-menu-bg-hov.gif" hash="34ea76a6d105d90fcb63bf105aadb8f7"/><file name="db-menu-bg-up.gif" hash="b0f754872dff5f2f0dc57ba193fdfa4c"/><file name="db-menu-bg.gif" hash="ea534c3c09bb309e566b6ae876655e13"/><file name="db-menu-sep-last.gif" hash="a01fe34854e1187e466fd58d462c4106"/><file name="db-menu-sep.gif" hash="7c5ae1cd59a189261cc3244358d5c1ad"/><file name="db-menu-start.gif" hash="aa5cac2194d937cc7fa904ccfce70ecc"/><file name="db-scroll-bg.gif" hash="06d2411e3b5f350ab21b625439d2d69d"/><file name="db-scroll-but-bot-roll.png" hash="6bc5e482f3f6d8fb1fc5014ddea43706"/><file name="db-scroll-but-bot.png" hash="25c0181e76ff8ceb3c0ec59071b8c72c"/><file name="db-scroll-but-top-roll.png" hash="b7961f2a3b5b641694a9b0b30d58e46b"/><file name="db-scroll-but-top.png" hash="de7df96e961596be9ff556924259b98b"/><file name="db-scroll-roller.png" hash="e01dde7bd096c52179acf29a425a29e5"/><file name="db-tab-bottom-left-bg.gif" hash="124388d44ac58b029377c6311a4782d5"/><file name="db-tab-bottom-mid-bg.gif" hash="9c48f33aa8907cfcb227bc779c2e1dce"/><file name="db-tab-bottom-right-bg.gif" hash="1db45e6fd8abc67d59f96a676607b412"/><file name="db-tab-footer.gif" hash="cac8928acba75bc1edd73186ced78e5c"/><file name="db-tab-header-sep.gif" hash="580312af7441b6a62f7e32081c40fb0f"/><file name="db-tab-header.gif" hash="fdf493b9477fcff7e7be98405effc33d"/><file name="db-tab-left.gif" hash="3fe3c55267dbbdd1db2ff959ccc9e0be"/><file name="db-tab-right.gif" hash="b7a32c8b03efe2fbdb63215d0446e3be"/><file name="dotted_divider_dark.gif" hash="8bf1de196d9ea048bfb25155cedd2e9e"/><file name="dotted_divider_light.gif" hash="92e562bf2070110f6b0a15e29b845445"/><file name="edit_icon.gif" hash="dbda31751c78d964c04394e9d8533187"/><file name="entry_edit_head_arrow_down.gif" hash="985c3ce4439fbf8bb2216fc7e73a3f0b"/><file name="entry_edit_head_arrow_down2.gif" hash="d68dd0fbc2819858a26ea2835c05df77"/><file name="entry_edit_head_arrow_up.gif" hash="d2b90a1823fff9f3917f19b427410144"/><file name="entry_edit_head_bg.gif" hash="1086b7196e8b33c4f46e49fecef0f35f"/><file name="error-msg.png" hash="3cd27b642416dacdc28907c89d934886"/><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="fam_account.gif" hash="c910fd1ff41b940d71b0835e02fc143e"/><file name="fam_application_form_delete.png" hash="972c2d998fc19572dd64af6b5e2e898e"/><file name="fam_application_view_tile.gif" hash="f595a133bf466cb91be23d9686fe6281"/><file name="fam_asterisk_orange.gif" hash="908d44da90de5e54185764d093bbdb77"/><file name="fam_bin.gif" hash="2fb388bc9f1d32d3802db8e91dc238bc"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="fam_bullet_disk.gif" hash="9fe82691d960c18d3d315c3f9164af4f"/><file name="fam_bullet_error.gif" hash="008802f44288b732b59cfe9fdbfecefe"/><file name="fam_bullet_success.gif" hash="465a056a3ba3d94367f51c3c0b751391"/><file name="fam_calendar.gif" hash="0614207ce4e3e0a9bd631b39e7692e3c"/><file name="fam_cart.gif" hash="1f2fd2c8ac6574488ea78302b6856191"/><file name="fam_comment.gif" hash="5138f9a4b6019a5b14b8ff9a32a3cb89"/><file name="fam_creditcards.gif" hash="b75b8ce2f4fceb58f8082c48344560c7"/><file name="fam_folder_database.gif" hash="e86175ff0f389ade1fc7bf15e03346eb"/><file name="fam_folder_palette.gif" hash="c0941b9145e06d53cc0d17ac4c151764"/><file name="fam_folder_table.gif" hash="e2914ba75944acd2a9e2d338fa339e16"/><file name="fam_group.gif" hash="52d778dddbf48b8d04226bee9370a7ef"/><file name="fam_help.gif" hash="2b5ed4c13a8e24456207b757826c7b2c"/><file name="fam_house.gif" hash="8eb2d580c5a40b7974f4263ca64fb94a"/><file name="fam_layout.gif" hash="5366a5f02260d3a860ef0c4787282ad6"/><file name="fam_leaf.png" hash="078d4f24683331b4557356a59e67b125"/><file name="fam_link.gif" hash="78590d5d8375d1baabe7b66d7b9ceb7d"/><file name="fam_lorry.gif" hash="174e86e45e76e7008fa3510cefa85047"/><file name="fam_money.gif" hash="6996bad465222fb6487cab94b4607846"/><file name="fam_money_add.gif" hash="70ceed401fe9913305f2362f7e26225d"/><file name="fam_monitor.gif" hash="f3bc806ff9d0907320b03018ba2d00ea"/><file name="fam_newspaper.gif" hash="9e5fee06a543742045118a95f2debcb8"/><file name="fam_newspaper_delete.gif" hash="41acabfc19102be92d3ccbc66d1fede3"/><file name="fam_newspaper_error.gif" hash="009bfa425298e1d2e44e38e58cd97938"/><file name="fam_newspaper_go.gif" hash="eb43105f8e13e3a752d7ca33bb086831"/><file name="fam_package.gif" hash="bf9be09ef64d006455baa211b7c03983"/><file name="fam_package_go.gif" hash="e4f8d380c2f8e5a7345e360293433764"/><file name="fam_page_white.gif" hash="26940eb67826c5af72b6048c7c5a8335"/><file name="fam_page_white_edit.gif" hash="a4f88300b74ad592a5c47ed54ff07af9"/><file name="fam_rainbow.gif" hash="e8b04cc945b3582a181d4ddbc2d2325f"/><file name="fam_refresh.gif" hash="01bbef614023c0890812e76bc7ecf7e0"/><file name="fam_server_database.gif" hash="7901fa06ffd68ed730cf43bb560756fd"/><file name="fam_status_online.gif" hash="a80019ffa3a573f709772ed1099343fc"/><file name="fam_tag_orange.gif" hash="6ce735a0e590bda040b6e1614c42e58a"/><file name="fam_user.gif" hash="63bbdd6d9d7a27591907a7b87898e259"/><file name="fam_user_comment.gif" hash="014dfd31d9af40e3d5960b2b0d900da3"/><file name="fam_user_edit.gif" hash="f5b36e803060c6b82e639a4fad57b9f7"/><file name="filter_row_bg.gif" hash="013a0929a7b2ddc6823bdda17d08acc0"/><file name="footer_bg.gif" hash="7724711d3ca07a5e46a6030e86743a71"/><file name="gift-message-collapse.gif" hash="5b710f5faa9c7352a39c10e3ebbee6fc"/><file name="gift-message-expand.gif" hash="fd53a70cbb1ea048754657a63787e9cb"/><file name="gift-message-grid-column-bg.gif" hash="97a8a9b8cc4ab68e7404ccf1320f50a6"/><file name="grid-cal.gif" hash="b1468e5239504974c689eea5d93f86d4"/><file name="grid_sort_asc.gif" hash="b78c3a1a27ac9672a31b7d1bbac60322"/><file name="grid_sort_desc.gif" hash="d958b946eba3dba863d724530a0dba1a"/><file name="grid_th_bg.gif" hash="8f4349fac728858374e17edf03390977"/><file name="grid_th_onclick_bg.gif" hash="7bf331e2a41e5331c4210bdc6adc4383"/><file name="grouped_to_order_icon.png" hash="4bdae9a6199655027b8b8aeee8f80ce4"/><file name="header_bg.gif" hash="cbe510856afa5cb0c32642c1f9a8eceb"/><file name="header_top_bg.gif" hash="8440b04c5cb6b1451bb886bfbef260a5"/><file name="horiz_tabs_ul_bg.gif" hash="58dbd9c45f76993346c2bb788896248e"/><file name="i_notice.gif" hash="ebd56dc80b8346e10e93628bc0e6c372"/><file name="ico_success.gif" hash="0afb20898a704a106cb4c598868abf32"/><file name="icon_btn_add.gif" hash="7300097305b577ee564dc49102822d16"/><file name="icon_btn_back.gif" hash="89ed97cede3f68241446a62c96e3ce4c"/><file name="icon_btn_delete.gif" hash="dbde0b76d36cfd624bf0de166d0a265e"/><file name="icon_btn_save.gif" hash="f5da95ac65efff5f5cf9c8830202764d"/><file name="icon_edit_address.gif" hash="d1ca2bb3a5c86afd379f25d9fc4352e3"/><file name="icon_export.gif" hash="9a13f20c6a17b41b9c357545c2da5636"/><file name="icon_export.png" hash="fb299dd13df666516eabe16f59193383"/><file name="icon_feed.gif" hash="0366583ed6e285d028442fcdebb05072"/><file name="icon_feed.png" hash="8537f6f88fcff4aac793247143d14e42"/><file name="icon_note_list.gif" hash="8d25ba225ca09b687a78bff510df5d10"/><file name="icon_remove_address.gif" hash="2de2b3d02c19adfb93e9e43a392db178"/><file name="login_box_bg.gif" hash="e4654826eaa8d5ebc0ab18e9bee71e1d"/><file name="login_box_bg.jpg" hash="404e37f4ee9f4ff9bfcb638741c7581d"/><file name="login_box_bottom.jpg" hash="038f15261e74bc381484f2fcfa45a73b"/><file name="login_box_legal_bg.gif" hash="528ac4dd480c4fc00ac808bf17394c05"/><file name="login_logo.gif" hash="9cc90e7aa1210883000fe5319862ce14"/><file name="logo-large.gif" hash="5c77654c424b0a35cc24d28df5166dc4"/><file name="logo.gif" hash="c7e9f290d965f707e4c4a61bfdab58cb"/><file name="massaction_bg.gif" hash="8b5f4db3ab3ea09cd5bd0164d67c4f0d"/><file name="massaction_button_bg.gif" hash="4c8262817e48d007237124ce0e7f4d18"/><file name="massaction_links_delimiter.gif" hash="9a0337183b5b67c0eed75993d7f14d10"/><file name="middle_bg.gif" hash="ba4f176d2c553201ebab4aba5c6d3d20"/><file name="more_arrow.gif" hash="38bb4c0e9270250151486d0bb36c476f"/><file name="nav1_active.gif" hash="a7f9ec7689a65c6b796f0d9b97582d01"/><file name="nav1_bg.gif" hash="a1d4ef5b590ce0a425dc04e45ed06cbe"/><file name="nav1_off.gif" hash="5286cbd5ac9ec1b6c027d5b48a74bdab"/><file name="nav1_on.gif" hash="a7f9ec7689a65c6b796f0d9b97582d01"/><file name="nav1_over.gif" hash="2c70d6175f1c965c27dda0598a67e63c"/><file name="nav1_sep.gif" hash="5286cbd5ac9ec1b6c027d5b48a74bdab"/><file name="nav2_last_li_bg.png" hash="279935c9799679fc5894337eaabc7cf0"/><file name="nav2_last_li_over_bg.png" hash="39536f00824293d11242888a76f40a5f"/><file name="nav2_li_bg.gif" hash="0a4f34b0e4436c519d31203f19503b83"/><file name="nav2_li_bg.png" hash="2fad219d162324e9a19f2745d5b6d562"/><file name="nav2_li_over_bg.png" hash="dc37c4a4aab40ea2ae44dea5ea133a9d"/><file name="nav2_link_bg.gif" hash="dce00ddad351e72e83bc87274cbaa54a"/><file name="nav2_parent_arrow.gif" hash="60e012a14a077bd2257343facc369c0c"/><file name="nav3_bg.png" hash="2bc7af80ad8886013da38401b63ab6df"/><file name="nav_bg.gif" hash="1b857c7d35f35ef9f6cae9e03a4e3dff"/><file name="nav_list_bg.gif" hash="7a4e2bdb887c12d8a1152bbcc8c02a3c"/><file name="nav_nest_link_bg.gif" hash="1d0c6b374bf02ac4b5aa012955c431de"/><file name="nav_nest_link_over_bg.gif" hash="fae3c579a4d432503b1f4f929d070609"/><file name="nav_on_bg.gif" hash="ac624b580cae5a76f6c92abc5a44191d"/><file name="nav_parent_arrow.gif" hash="3a95559263e569dc1c8065cb2d9b3f2c"/><file name="note_bg.gif" hash="105967d7c15ab4610726eea52d862a97"/><file name="note_cell_bg.gif" hash="71e656d42f8ba8c2d477c6866c499b71"/><file name="note_msg_icon.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="notice-msg.png" hash="9cd1dfebccec8a2123d543fa49b17bd7"/><file name="pager_arrow_left.gif" hash="6e44f608dac8eb8be1d1ebee5a3285aa"/><file name="pager_arrow_left_off.gif" hash="30f5e56195ab3546b36f4016db5254be"/><file name="pager_arrow_right.gif" hash="cc79526156b7e0c8abce61fad3d53f77"/><file name="pager_arrow_right_off.gif" hash="f01b7dad9acf0180b5c62edbd7ea9939"/><file name="paypal_logo.gif" hash="871e205a64292121f4c893373acfb581"/><file name="paypal_section.png" hash="d032551b47e48dced277c4fa344ac7f6"/><file name="paypal_tick.gif" hash="e8685c1fb7c4c106ae4fd24e9bbf5a27"/><dir name="placeholder"><file name="thumbnail.jpg" hash="5c73b5aa515b1719f7b398f5131f91a8"/></dir><file name="process_spinner.gif" hash="345b30b4d0b6088d0151ecfbdf48c036"/><file name="product_rating_blank_star.gif" hash="5e20a299c0ff16168be38b6dde580eda"/><file name="product_rating_full_star.gif" hash="dd5aae332178d928a7f49dea7691b5f6"/><file name="rule-ajax-loader.gif" hash="32dc1f5901143d36fbd7a6df3950819f"/><file name="rule_chooser_trigger.gif" hash="9c498e789c3ce734f5301c2475e2a04c"/><file name="rule_component_add.gif" hash="7914e57701ca26f5c8bf23c6bc3e1f25"/><file name="rule_component_apply.gif" hash="3f9b9025551da6963a9ecf8d184a204a"/><file name="rule_component_remove.gif" hash="4d785bcecfbe716fa4d749d20738a8f0"/><file name="save_btn_icon.gif" hash="f5da95ac65efff5f5cf9c8830202764d"/><file name="sec_nav_bg.gif" hash="99c6741591cdb2a2a128668a1d32d668"/><file name="section_menu_bg.gif" hash="f9edd44c92743a0c9ae9535a7992d6b1"/><file name="section_menu_bottom.gif" hash="167d2ef46ff80158c807b4b916501b28"/><file name="section_menu_link_bg.gif" hash="bcabd4fea0d67b181f21779564c2284b"/><file name="section_menu_link_over_bg.gif" hash="7da7e56567633aab279cf3aec6f49d8d"/><file name="section_menu_over_span_bg.gif" hash="f5ea5292f15ed62b99f0f51d9fff2c66"/><file name="section_menu_span_bg.gif" hash="dbf3916358e794ee809b4cf33903af2c"/><file name="section_menu_ul_bg.gif" hash="3aea6e5452f548438ca34e17954a9d6b"/><file name="side_col_bg.gif" hash="b3691fd62663457af39eaf71dd8cda5a"/><file name="simple_container_bg.gif" hash="56f1ac91169eb4896b8c91384fc8bf15"/><file name="sort-arrow-down.gif" hash="fc2cd9f756ce510c4470478d720f81cd"/><file name="sort-arrow-down.png" hash="dc65160d9d4d6cdd6bfe1b397a931975"/><file name="sort-arrow-up.gif" hash="39026b0ff1f0c18091caa60384491163"/><file name="sort-arrow-up.png" hash="da54e5306bdce67551aa415f5d7f7ea7"/><file name="sort_heading_bg.gif" hash="6066d09f237f556b0a4770e4788e7598"/><file name="sort_on_bg.gif" hash="0cb36788ed4fbf19e657acbc75a3f1b8"/><file name="sort_row_bg.gif" hash="f2e1c5cb26b9f5211419b99d30745244"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><file name="sub_button_bg.gif" hash="e3f66dd60510f9f7e937e2e55442c30a"/><file name="success-msg.png" hash="c64cb2acc3d0eeba48fdea83620913ed"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="tabs_link_bg.gif" hash="34447929f5e6591ba9b5795b983fdfd4"/><file name="tabs_link_over_bg.gif" hash="2cf3f56884096055fb0bdf9474f280c9"/><file name="tabs_span_bg.gif" hash="bcabd4fea0d67b181f21779564c2284b"/><file name="tag_blue_edit.gif" hash="b2163ac3baf7d822b48593342846645a"/><file name="tn_cancel_bg.gif" hash="fcb3506858fcfa8d1778b0683dc89f54"/><file name="tooltip_bg.gif" hash="0aa4b866fc067a75f27ab749c1dabf74"/><file name="tooltip_corner.gif" hash="71146534671d5e0751505640b7c59859"/><file name="tooltip_top.gif" hash="032ff52a6ff5714cbdf6c1f62abaf7e5"/><dir name="tree_icons"><file name="join.gif" hash="4d5d614e0da056df815a4306d6368692"/><file name="joinbottom.gif" hash="4b3daa7f2cc584f1aac0d142275d7cba"/><file name="line.gif" hash="63ab38a6203262f15ca46c631232ea2c"/><file name="minus.gif" hash="d647fbbd0ec410b8f3bb3357b62eedcf"/><file name="minusbottom.gif" hash="b09d684cca7135ef728141aaf2464baa"/><file name="nolines_minus.gif" hash="eb2243a354ffcfac93ba0fe948f7167d"/><file name="nolines_plus.gif" hash="ec92b634b63608fb4b0dbf114e3b89e1"/></dir><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/><file name="varien_logo.gif" hash="6f10d0fe572cb012947c164217e9e428"/><file name="warning_msg_icon.gif" hash="4cf6ec7f59ab09f9c18b3a4301714c6d"/><dir name="widget"><file name="catalog__category_widget_link.gif" hash="8435943009f1f774bbd6a4809c719eb8"/><file name="catalog__product_widget_link.gif" hash="62f2d7020143f98ba7514469eb612a7f"/><file name="catalog__product_widget_new.gif" hash="37a5af9f98ae73e180ad0cca05c95324"/><file name="cms__widget_block.gif" hash="b7b0b1517cc38b18b92841b33b312190"/><file name="cms__widget_page_link.gif" hash="b839dee210e61850a5858cc8634cbccd"/><file name="default.gif" hash="684143ae5531aa6ba22215f4fadeea6c"/><file name="reports__product_widget_compared.gif" hash="bd3e5a5015eb2c5c64f1d11835166dc4"/><file name="reports__product_widget_viewed.gif" hash="44d5cd71e4fb7235f9cff0c7e2b2f531"/></dir><file name="widget_placeholder.gif" hash="2bd8d72cf12f8d7d0a6a3268f97786ff"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/><file name="window_content.png" hash="08361df29783d46a2493cf0d8ad733a7"/><file name="window_top.png" hash="555a8db5efa3a252c2ead3d3dadd1075"/><dir name="wysiwyg"><file name="skin_image.png" hash="a521b0c60b001de4a3405e73c4a6cd4a"/></dir></dir><dir name="media"><file name="editor.swf" hash="259afd515d7b2edee76f67973fea95a6"/><file name="flex.swf" hash="60a8c242ca2ff0e70ed9a038749f4cc1"/><file name="uploader.swf" hash="1c300001dadd932ef6e33a2fadf941e1"/><file name="uploaderSingle.swf" hash="304dd960698c5786dcd64b0e138f80ca"/></dir><file name="menu.css" hash="6f39c760b70b8250c193c5311885193a"/><file name="print.css" hash="db77a54f0e6a7146cad6566eb200a0d5"/><file name="reset.css" hash="d45948716e2dd828a40715b9a43e2115"/></dir></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Adminhtml</name><channel>community</channel><min>1.5.0.0</min><max>1.6.0.0</max></package><package><name>Lib_Js_Ext</name><channel>community</channel><min>1.5.0.0</min><max>1.6.0.0</max></package></required></dependencies>
-</package>
diff --git a/var/package/Interface_Frontend_Base_Default-1.5.0.0.xml b/var/package/Interface_Frontend_Base_Default-1.5.0.0.xml
deleted file mode 100644
index e8e6943e0f..0000000000
--- a/var/package/Interface_Frontend_Base_Default-1.5.0.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Interface_Frontend_Base_Default</name>
-    <version>1.5.0.0</version>
-    <stability>stable</stability>
-    <license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>This is a Magento themes base</summary>
-    <description>This is a Magento themes base</description>
-    <notes>1.5.0.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:00:53</time>
-    <contents><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="etc"><file name="widget.xml" hash="b70f498da376b9b9b92f118a31b6b0e2"/></dir><dir name="layout"><file name="authorizenet.xml" hash="dceb85336c68e9648d0c448def6c131f"/><file name="bundle.xml" hash="775105895ce19ff0132ab3e858031e19"/><file name="catalog.xml" hash="149666f6f3b2fd6cc72ff49acb2b455e"/><file name="cataloginventory.xml" hash="496c3b56082a7a39a0152dde39a773d0"/><file name="catalogsearch.xml" hash="0c3c834b84a06eb560834c35476558ee"/><file name="checkout.xml" hash="28f1ddde687c80604691a41a03ed59a5"/><file name="cms.xml" hash="e3aa2ca2f18c75846ff706378e5fa601"/><file name="contacts.xml" hash="4600862503197d6e9b575b65e170f088"/><file name="core.xml" hash="784938988c61a7db69324d0392a9e282"/><file name="customer.xml" hash="0be0ad6206729340403c12b5bf6ef192"/><file name="directory.xml" hash="7b11c924e6b4f946327c7dc9bad8b122"/><file name="downloadable.xml" hash="80883ebfa7d2703fd41985fb4da8e2cb"/><file name="googleanalytics.xml" hash="1f9efeef6fc6fa043e67ea0e755bd883"/><file name="googlecheckout.xml" hash="8a57b426ae67634956c2d5c8fc6ec5b0"/><file name="googleoptimizer.xml" hash="e0776e5ea61aea98766071e02fbbc4a6"/><file name="newsletter.xml" hash="217665c4845eb5be071776bc24acc468"/><file name="page.xml" hash="3c8375d3706016d87db8b9285b7b3c4a"/><file name="pagecache.xml" hash="570579be0932253efedba6d401a7452a"/><file name="payment.xml" hash="82d18e55bd265f40b1b714a0b50dfa4c"/><file name="paypal.xml" hash="a0b673fb1a3f3bbf3088b8a5b2a9cebd"/><file name="paypaluk.xml" hash="abf7f1df1e361b22b7d1e9b5d4a7edf4"/><file name="poll.xml" hash="366e2442215055ecd8e4479ee7de129f"/><file name="productalert.xml" hash="586ea53a01f2626b13ca31617dbb22e4"/><file name="reports.xml" hash="23c57fd9e0e10270eca222f4c7a4093f"/><file name="review.xml" hash="1f1d49461943c18633b07b1226dd9316"/><file name="rss.xml" hash="49d7a64cf0afe3b7e23a199b67db077f"/><dir name="sales"><file name="billing_agreement.xml" hash="fc2598f0cb38f13f416712dba7964e41"/><file name="recurring_profile.xml" hash="571e9893c41f32f3adfecab3f98cca7e"/></dir><file name="sales.xml" hash="5d12780e838df449c5145cbf7c57c89b"/><file name="sendfriend.xml" hash="9cf06e43342db3317c9c9a67e2d6ec16"/><file name="shipping.xml" hash="f0462d4e85c24aac9b1236e3468cdf54"/><file name="tag.xml" hash="7c5075c167922657dfef1daddcba6ec7"/><file name="weee.xml" hash="2d96134512928accf60b396b731ee095"/><file name="wishlist.xml" hash="5fcd0b16e40c46f1e1a484fac45779a4"/></dir><dir name="template"><dir name="authorizenet"><dir name="directpost"><file name="form.phtml" hash="e45fae0e9501bbfe0fb78297860c7faa"/><file name="iframe.phtml" hash="8cd6ff8201a777435c32a5e1be8ec36f"/><file name="info.phtml" hash="3a2a73a49b19cae9922cdcb5c9939d7f"/></dir></dir><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="list"><file name="partof.phtml" hash="ebe9c152f52e5587d0610ae8ce119575"/></dir><file name="price.phtml" hash="f2939c0858013090d0dc170206541736"/><dir name="view"><dir name="options"><file name="notice.phtml" hash="a5b635b16f7b39ef5a28285dcb4b3e7f"/></dir><file name="price.phtml" hash="6f12652da733d1a35b94ec9da6e624ea"/><file name="tierprices.phtml" hash="df12beaff96beb48d135348320a90ade"/><dir name="type"><dir name="bundle"><dir name="option"><file name="checkbox.phtml" hash="fe287f9920f096f317f21fd31a0f9dca"/><file name="multi.phtml" hash="58cc8bfd4461ca511c60d9eee2490c5e"/><file name="radio.phtml" hash="30f78da906a3b85914c18b66e4417a64"/><file name="select.phtml" hash="d33b3fc7dafd5e8d29b505aed5c892ab"/></dir><file name="options.phtml" hash="102c3e09d4cb047cc054b2c2ade787ec"/></dir><file name="bundle.phtml" hash="5572ecabb603fcec17b63cca5e7036e2"/></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="bd5185aa8de9a80a2e80d14000cbe6a7"/></dir><dir name="invoice"><file name="default.phtml" hash="934dc90a4dfdd58455600bbe7d9a68c4"/></dir><dir name="order"><file name="default.phtml" hash="40a48f4e43ac8d68ca8e8c7b30407bcc"/></dir><dir name="shipment"><file name="default.phtml" hash="09b74c4161e5c509c0b284e7e52356c4"/></dir></dir></dir></dir><dir name="rss"><dir name="catalog"><dir name="product"><file name="price.phtml" hash="886788842f9dbdae5b2d69e7f5e0a3ac"/></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><file name="renderer.phtml" hash="dae690d9e9df0e24b49632c65bda0b31"/></dir></dir><dir name="invoice"><dir name="items"><file name="renderer.phtml" hash="fce25123fe9912fdec19dd2360ea7bc6"/></dir></dir><dir name="items"><file name="renderer.phtml" hash="99c3bfdd8a8ab512da9177a54cf4d16f"/></dir><dir name="shipment"><dir name="items"><file name="renderer.phtml" hash="166900cc4b5820a97bb5b71bbc4aaefa"/></dir></dir></dir></dir></dir><dir name="callouts"><file name="left_col.phtml" hash="00657129c0516a4814789c3e509e490c"/><file name="right_col.phtml" hash="00657129c0516a4814789c3e509e490c"/></dir><dir name="catalog"><dir name="category"><file name="page.phtml" hash="459dc32a2f72bc4c3e256c9b1ec105e7"/><file name="view.phtml" hash="bbfe838e7d9f8d390671ebd66906751a"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="92d4a01677bd5f8d9ef9de0f32dd3b64"/><file name="link_inline.phtml" hash="23823ac549e1a8088a82a2e1cb54bedc"/></dir></dir></dir><dir name="layer"><file name="filter.phtml" hash="0bcfacbe40430cb5466f36debb58af73"/><file name="state.phtml" hash="ce4dabceb517ebc1d3bbc0217b050787"/><file name="view.phtml" hash="c39afc5758867a38c13883f9779ee618"/></dir><dir name="navigation"><file name="left.phtml" hash="4b36d10d83b0fdd32ac22bf7f8c9420c"/><file name="top.phtml" hash="7b041ebf5412958e4585e2ccb7daf42e"/></dir><dir name="product"><dir name="compare"><file name="list.phtml" hash="e0487a83f78a7596d1bde2caa6f94d10"/><file name="sidebar.phtml" hash="67cc882540a4b1cf8c63734f7e813fbd"/></dir><file name="gallery.phtml" hash="595b803e2eae9791b721166c8fc20715"/><dir name="list"><file name="related.phtml" hash="8627d4ae1b9a6477fc92f2627d2b5b29"/><file name="toolbar.phtml" hash="92e50bf1e4406c387b24ac818a798d14"/><file name="upsell.phtml" hash="e50408c060a6578b2e67df2a46a157fa"/></dir><file name="list.phtml" hash="1dc5bf01d184ec3dd62b7dcae3a910af"/><file name="new.phtml" hash="91f61c24f6c9e040a12d88e8672bbc41"/><file name="price.phtml" hash="6cda079b2e4c4278a3c120fa7d9c4656"/><dir name="view"><file name="additional.phtml" hash="17f72df0c3884ea701fe27781d6304e5"/><file name="addto.phtml" hash="a2d1730d581db8d3ec564b25ff0c39aa"/><file name="addtocart.phtml" hash="7db15069c6810e9ecaa824bdd7ab60aa"/><file name="attributes.phtml" hash="3d14a1a9793783586311a1abb808d765"/><file name="description.phtml" hash="ea8e40ae398e20085c87762ad46fc95c"/><file name="media.phtml" hash="84bcaf873d97d4aac9d1a37f5cd49d37"/><dir name="options"><file name="js.phtml" hash="0f88cd39b94b180dcbc66b7881f59897"/><dir name="type"><file name="date.phtml" hash="4f9371b64b26809af0b92f17aea2612b"/><file name="default.phtml" hash="075f27dd7636aee98f5041a9586246c8"/><file name="file.phtml" hash="5e9c8e5cdd13b4cc92bd172554dde45d"/><file name="select.phtml" hash="80830f800c950e31fcfc1ee9628aaa44"/><file name="text.phtml" hash="ac27484be20ec26370070e9dc73b8de1"/></dir><dir name="wrapper"><file name="bottom.phtml" hash="57ab510ee102bf9480164a5b042eabfb"/></dir><file name="wrapper.phtml" hash="36c43af32544e878e495ff19b4f4e36d"/></dir><file name="options.phtml" hash="2f11c5102bcda42f0806ba6da9c9ff05"/><file name="price.phtml" hash="e5dd5215fcf26734a1ae385939ce140d"/><file name="price_clone.phtml" hash="6c12eaebb6d1028bfee665d01ca6c3e2"/><file name="tierprices.phtml" hash="5382af49955271b98691d914482c29b2"/><dir name="type"><file name="configurable.phtml" hash="80f966e4732c65a23277c3ceb0137043"/><file name="default.phtml" hash="9419477d05d456fbb81d2a61510d71c2"/><file name="grouped.phtml" hash="6a4ebafe5f0c481208360dbec8d5503c"/><dir name="options"><file name="configurable.phtml" hash="2590093adb5a6aaf1e7f0ed7b314a796"/></dir><file name="simple.phtml" hash="80f966e4732c65a23277c3ceb0137043"/><file name="virtual.phtml" hash="80f966e4732c65a23277c3ceb0137043"/></dir></dir><file name="view.phtml" hash="5fb61681585246d42f94f5801e0fb0e9"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="4862084a1233a7d57316700739f9a0ef"/><file name="link_inline.phtml" hash="0835fe96cfdb2e8dd8a9047411d1e35e"/></dir><dir name="new"><dir name="column"><file name="new_default_list.phtml" hash="3eda2e4134f17eaa9d5184e9da249567"/><file name="new_images_list.phtml" hash="994a6fd0bee62d89573c8c61099ff863"/><file name="new_names_list.phtml" hash="ecb12647ad39abc32baf772d331875b4"/></dir><dir name="content"><file name="new_grid.phtml" hash="42c84890a6c55727595261f390f44d14"/><file name="new_list.phtml" hash="b28970772437c559367391406181a333"/></dir></dir></dir></dir><dir name="rss"><dir name="product"><file name="price.phtml" hash="53434cc9d4f86c98ae24474f43abf2d9"/></dir></dir><dir name="seo"><dir name="sitemap"><file name="container.phtml" hash="2cc22f1474cc56804507390c1f0b78b9"/></dir><file name="sitemap.phtml" hash="b4ee672b988d5780c261d6dfc27f0be7"/><file name="tree.phtml" hash="57236a704be4d6a8e35702d602813337"/></dir></dir><dir name="cataloginventory"><file name="qtyincrements.phtml" hash="e8ce317fb4c8baba38ab661fdc075a72"/><dir name="stockqty"><file name="composite.phtml" hash="c6ad914c94a722cd443ad59d0e89b93e"/><file name="default.phtml" hash="2416f053f82705973aae0983275ee466"/></dir></dir><dir name="catalogsearch"><dir name="advanced"><file name="form.phtml" hash="f57cff992f2ae8952cafc7983f91ac6b"/><file name="result.phtml" hash="03e199eda8913c5de11bad64c3cb7d28"/></dir><file name="form.mini.phtml" hash="3ac3d0ccc7b602f8f2b4d55d25af794a"/><file name="result.phtml" hash="ac7ce473496ae569b03cd053c2c9e99d"/><file name="term.phtml" hash="53578b74dbdba2cc4ab53e7613ab74d0"/></dir><dir name="checkout"><dir name="cart"><file name="coupon.phtml" hash="6f3224ea540f21638b6b59371a0b0caa"/><file name="crosssell.phtml" hash="eca612ba359b7eedb92e0037e35bc4da"/><dir name="item"><dir name="configure"><file name="updatecart.phtml" hash="910098349a67ed9a3d024cde7b8ffe18"/></dir><file name="default.phtml" hash="b9c46ff60be3ed0549f40de1fc8f5531"/></dir><file name="noItems.phtml" hash="a226178105b57ea0a08fc5e586929d6d"/><dir name="render"><file name="default.phtml" hash="65d60f1cc9de1c4c5a1ed00e4aef64b0"/><file name="simple.phtml" hash="ff32797095b5b1c629f3bbc61e071669"/></dir><file name="shipping.phtml" hash="4e5b50a6cfd2bbef21c38576f4e294e6"/><dir name="sidebar"><file name="default.phtml" hash="3f9997b2e3cf688e07bf94c478548032"/></dir><file name="sidebar.phtml" hash="fc3147b06425163174ddb57f852acc82"/><file name="totals.phtml" hash="ef580ddb64df7e1663c15ea6032eb674"/></dir><file name="cart.phtml" hash="a93366cf5bd9c016cec38f241b800051"/><dir name="multishipping"><dir name="address"><file name="select.phtml" hash="171aa755eea47d19808e670e3e9f9f57"/></dir><file name="addresses.phtml" hash="2120a18e8a233a1e8cab52cd42d75311"/><file name="agreements.phtml" hash="a0e10c70d1c78bdea2fbc9340ae9fd0f"/><dir name="billing"><file name="items.phtml" hash="15cb9a911f0462402c3da2ba755d35e0"/></dir><file name="billing.phtml" hash="0a213a135a6d4c41d7d993b99f3c88b5"/><dir name="item"><file name="default.phtml" hash="33025c25bfba19802b0005197a3d8941"/></dir><file name="link.phtml" hash="422a87c700e1a1e234f7c8aafbbeba60"/><dir name="overview"><file name="item.phtml" hash="26047e6b5338820589583fcb48c401f5"/></dir><file name="overview.phtml" hash="af69bb74a6f487b6f9e5beeb58a2301a"/><file name="shipping.phtml" hash="48a248b529ced2ba1562c2c8c95b561d"/><file name="state.phtml" hash="47a30be5f08366cd6222b29cc8e71443"/><file name="success.phtml" hash="137308e09b8893ee1eae4e521ff6a7e4"/></dir><dir name="onepage"><file name="agreements.phtml" hash="27d773a74d4429aead5fc91d665155d1"/><file name="billing.phtml" hash="02f0c82112ba19f0f8511a3d543c87dc"/><file name="failure.phtml" hash="30b563a2dc54e1d1220433508f195f16"/><file name="link.phtml" hash="ad2b86530c743b457f837de82462c2c7"/><file name="login.phtml" hash="737ba9ec27505b12fd526f752c6cc443"/><dir name="payment"><file name="methods.phtml" hash="22cf8391c13865b007dc33fb89f1a0dc"/></dir><file name="payment.phtml" hash="fdd375638c38b233ad9f340a20220825"/><file name="progress.phtml" hash="76a0644a1ea8613b03122bcbde663ee6"/><dir name="review"><file name="button.phtml" hash="82f48790eaa4d07395cb4b0e1db44b95"/><file name="info.phtml" hash="6e9eff38d7761a5d2cd5e03865a49052"/><file name="item.phtml" hash="7c4fd54fb91b0c65baf4f27c99413394"/><file name="totals.phtml" hash="ab5ae9a5d6d9936c1d87a64908482c36"/></dir><file name="review.phtml" hash="3ef2cb42a00e9458fc43b005840d85d4"/><file name="shipping.phtml" hash="7c639b573df60abd4840f66d11ca4cd6"/><dir name="shipping_method"><file name="additional.phtml" hash="16415fda2562d00468703d2c02146cce"/><file name="available.phtml" hash="ffe98ccd33f7cc8e4f86a7c080e47892"/></dir><file name="shipping_method.phtml" hash="5412f35c33b955e2f6041bcb789b4268"/></dir><file name="onepage.phtml" hash="b6a117927622a351905381e81cdfce8c"/><file name="success.phtml" hash="112272a2f10725b81f60fd3e31af174e"/><dir name="total"><file name="default.phtml" hash="d52aa098719160b38face74db1341bb1"/><file name="nominal.phtml" hash="92e45bb542f2cf4143994c21fe823128"/><file name="tax.phtml" hash="4e14b7ec0d657348548d77da99038168"/></dir></dir><dir name="cms"><file name="content.phtml" hash="cca62f2e43199fdcf6befdee4fb8c33f"/><file name="content_heading.phtml" hash="6ad8eebc71356ee8e7f1a2131acda68d"/><dir name="default"><file name="home.phtml" hash="cfb84d72f7e7a04a6e985d2e45d96712"/><file name="no-route.phtml" hash="a15f1ed145a5ede4626048bab1a7bfc8"/></dir><file name="meta.phtml" hash="dcfb7e22bbcb0d21574d583ddaeac518"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="97b1b5d3004cd0810c5818c768a53da1"/><file name="link_inline.phtml" hash="c11318e66ac76b89ed233d3dd95f4d52"/></dir><dir name="static_block"><file name="default.phtml" hash="7279b3ca64e7a3fe91f0f7b1ffa2ed47"/></dir></dir></dir><dir name="contacts"><file name="form.phtml" hash="22760465acb50fed69d737cd11c6d056"/></dir><dir name="core"><file name="formkey.phtml" hash="dffae374b59cd5ac5212fb6274becaf1"/><file name="link.phtml" hash="10b7b17a573930875e711910f551184c"/><file name="messages.phtml" hash="73ebb6ef404a049e95c59b83e5458c4d"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="8bac3445e9518f1bd050dd9916e897e7"/><file name="hello.phtml" hash="a8b6b2dc9f5caab825a575238696d68a"/><file name="info.phtml" hash="773d77c6b7219cd8b3768a6fd6e15f26"/><file name="newsletter.phtml" hash="0be058d555894c853e06096cdf64df90"/></dir><file name="dashboard.phtml" hash="f27d1503b0cf7a466a3cb5ac3f85ae94"/><dir name="link"><file name="back.phtml" hash="70830cac18e686c71552ca33ebc1c775"/></dir><file name="navigation.phtml" hash="fb54d6883a32edd6a91414b81d5e9afb"/></dir><dir name="address"><file name="book.phtml" hash="2f985f95a45dc6099f49d19a0eb9fc6b"/><file name="edit.phtml" hash="acaf56ba64ca27e224a09e791c86c526"/></dir><file name="address.phtml" hash="39fe0b2d0296e6b448058db918517f8c"/><file name="balance.phtml" hash="fed4a9d7108cff7383f51b41852b5115"/><dir name="form"><file name="address.phtml" hash="9282d8579ba8cdd88465cc5ad5cb7b4e"/><file name="changepassword.phtml" hash="7cfbda91095134392a3cd8fa943b013e"/><file name="confirmation.phtml" hash="f6d47ffd4d3ebc10008d36319291db29"/><file name="edit.phtml" hash="704c4b21c4c0fc8923e78fecbebe121d"/><file name="forgotpassword.phtml" hash="14a238cd204e008935b2a461930edcfa"/><file name="login.phtml" hash="4fa4ae520699c76d8b43fee3a094f90a"/><file name="mini.login.phtml" hash="f0e9954b70e54fdff18e2455e247d2dd"/><file name="newsletter.phtml" hash="96e7af6f2eb8c8400bf73465a456dc97"/><file name="register.phtml" hash="7c3f64f046866686be3d0e36eb367285"/></dir><file name="logout.phtml" hash="623f11856f9652535a49e9759f8ed857"/><file name="orders.phtml" hash="54abd08e4c73fedaa2e1dd90a63015a2"/><dir name="widget"><file name="dob.phtml" hash="abe10f96c632d2550d44658b943bbaa1"/><file name="gender.phtml" hash="eb58e85df9448694cde2f50d311c08cd"/><file name="name.phtml" hash="a8042aabf293311965de91194aa01855"/><file name="taxvat.phtml" hash="759ddf46f102024c50ed44ef77d71e64"/></dir><file name="wishlist.phtml" hash="0f70687a4fea50fa24711ac99077ec28"/></dir><dir name="directory"><dir name="currency"><file name="switch.phtml" hash="04bae72aea8b53f58a75f87105c59d20"/></dir><file name="currency.phtml" hash="e345fc3eee8b217f2d4522c05807ed28"/><dir name="js"><file name="optional_zip_countries.phtml" hash="4dbf932554898b43f6782965be0e7a47"/></dir></dir><dir name="downloadable"><dir name="catalog"><dir name="product"><file name="links.phtml" hash="bad88492f9ce7a44b818fab2b23c122a"/><file name="samples.phtml" hash="d5cfeb3c5d39d685cb0a61c0a1dcff02"/><file name="type.phtml" hash="41d05e4727b91506f0f7aa7bb2b6e536"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="4f355119c2cc78b9533cc52867af245b"/></dir></dir><dir name="multishipping"><dir name="item"><file name="downloadable.phtml" hash="0fd5129f0beb919a7973d9a08d328878"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="a5022a15e9f5cbb6a5f4f01090d01965"/></dir></dir><file name="success.phtml" hash="ac4260739a984e06f817b634a550bdbf"/></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="9af52c5f7e79146a952a2d3c83ab9599"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="downloadable.phtml" hash="f36c047061299654963674ebdfa4686e"/></dir><dir name="invoice"><file name="downloadable.phtml" hash="b4223253ef9ec6a925fcbeac62d45379"/></dir><dir name="order"><file name="downloadable.phtml" hash="13cc6a1b1cb483476ac1323f83d74dd1"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="e914700b3e288e10b32e76dc3fe26d88"/></dir></dir></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="24a0164723e472ec139d931a19e73822"/></dir></dir></dir><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="2a80331f1f1b2f2d4faf226543bb12e6"/></dir></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="creditmemo"><file name="items.phtml" hash="65726cf83968eefe4ed3d5ff4a33f640"/></dir><dir name="invoice"><file name="items.phtml" hash="e8d0a6f6b623731c2ee357ac0ca492b5"/></dir><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="af9be89ed996082c61d9626b41b1fa90"/></dir><dir name="invoice"><file name="default.phtml" hash="af9be89ed996082c61d9626b41b1fa90"/></dir><dir name="order"><file name="default.phtml" hash="e13ae530d5bc7a4203fa131aa3c39bcd"/></dir><dir name="shipment"><file name="default.phtml" hash="a15503ce3defdfc7669091e8986441d2"/></dir></dir><file name="items.phtml" hash="d671fc38e42ea4b38664a9c6db666549"/><dir name="shipment"><file name="items.phtml" hash="e74a2af5404ade1fab236f4828d28e55"/><file name="track.phtml" hash="33c7150c62d42b6cd292b64ee79cb271"/></dir></dir><dir name="productalert"><file name="price.phtml" hash="e2f202e0e7c93d0efe8f66a275e7649c"/><file name="stock.phtml" hash="9e8a272ad3bbca40aa209a89048f7869"/></dir></dir><dir name="giftmessage"><file name="inline.phtml" hash="611c61dfac07031ae6a13a4e7e75568a"/></dir><dir name="googlecheckout"><file name="form.phtml" hash="8c82ca46a4471f899b0d79a54f0b3e01"/><file name="link.phtml" hash="6932d745269afb51fc4bcf8379177e58"/></dir><dir name="newsletter"><file name="subscribe.phtml" hash="d52c2b9e8e822ecbd833cad2834d9051"/></dir><dir name="page"><file name="1column.phtml" hash="26be16115e5cccb15f006b76ad5129d7"/><file name="2columns-left.phtml" hash="509e6dc4a4216a6fb7276128cc37156a"/><file name="2columns-right.phtml" hash="1992bd6aa0c74035cd5f757f78fb8d9d"/><file name="3columns.phtml" hash="f0dc9c33b1be8947371c552851e326ad"/><file name="empty.phtml" hash="7fa74ca0b0def89eff979f484db0e4f1"/><dir name="html"><file name="breadcrumbs.phtml" hash="3419ba4ebe6b77244ac4aa7960dc7bd2"/><file name="footer.phtml" hash="ed99d05eb5d3bd76588cfdb24ebf9d24"/><file name="head.phtml" hash="16ad8f57f2f44c5f3a6c532a62318257"/><file name="header.phtml" hash="039d0b4d7f11275ef93234d646f0fdc2"/><file name="notices.phtml" hash="c1dd6807ef0bc0740fe457c277746b43"/><file name="pager.phtml" hash="1bf5ef70b19f52c60056cf5300bdbda8"/><file name="top.links.phtml" hash="81f191bb273970893982c1f50494777a"/><file name="wrapper.phtml" hash="e6810912880abf5a471c521be9048f45"/></dir><dir name="js"><file name="calendar.phtml" hash="a45137cadc88a52ea9f477119f7370b3"/><file name="cookie.phtml" hash="564cddbd899aa6d5de4d4ccc9e165934"/></dir><file name="popup.phtml" hash="b742c9d9ae1252ca6c5025ef019bf888"/><file name="print.phtml" hash="e7f12953e63e0bd303296419e5576fe4"/><file name="redirect.phtml" hash="3fefce1d175c54a654a162ecc9c4c271"/><dir name="switch"><file name="flags.phtml" hash="2149880eed16b81af4ce300e0a46e4de"/><file name="languages.phtml" hash="7e45cfbe0f7f78f2363e5b6880f69e8a"/><file name="stores.phtml" hash="cae33abb4a9e0928a722b36734fb089f"/></dir><dir name="template"><file name="container.phtml" hash="30f7128349d36d21a221d98ad48804fc"/><file name="links.phtml" hash="cea84ab829f92b77481396d4cbfe1afc"/><file name="linksblock.phtml" hash="4d1e04558fe45732b3eca9989f8f1e9b"/></dir></dir><dir name="pagecache"><file name="cookie.phtml" hash="3ca4407ab2d95dce1bbe13acfe212d2d"/></dir><dir name="paygate"><dir name="form"><file name="cc.phtml" hash="5994f10d4158069450a7027d3be80f3d"/></dir><dir name="info"><file name="cc.phtml" hash="3ce6edf455e1cc387612caf7b110d480"/></dir></dir><dir name="payment"><dir name="catalog"><dir name="product"><dir name="view"><dir name="profile"><file name="options.phtml" hash="bcaa078d606426f7ab758c7e367eda64"/><file name="schedule.phtml" hash="ad6628f653c310613357b5951dd1b0c5"/></dir></dir></dir></dir><dir name="form"><file name="cc.phtml" hash="e0635a95db6ae6185ba11da9470197d9"/><file name="ccsave.phtml" hash="2cdce714d606365ab90b4859a252a46d"/><file name="checkmo.phtml" hash="93daeb65e53c01a43d89b4273c2fd275"/><file name="purchaseorder.phtml" hash="edbd2fabc0d32fd15804d10d3972b544"/></dir><dir name="info"><file name="checkmo.phtml" hash="8cb1e65c3da15fc2cf91e7e1204faae7"/><file name="default.phtml" hash="233335e8ab656e14752b27c9c2074a04"/><file name="purchaseorder.phtml" hash="f976c7bcdeff2aea2fb32d9dd330cb4f"/></dir></dir><dir name="paypal"><dir name="express"><dir name="review"><file name="details.phtml" hash="852b25f9b47f6e9f761ce39f4a2f298a"/></dir><file name="review.phtml" hash="ef971f951967b0ed591bfa2437887e1b"/><file name="shortcut.phtml" hash="c90e5a48e09de5fcb8fe66aabda93e6d"/></dir><dir name="hss"><file name="form.phtml" hash="deb6cd68b646e820a597067850b291c7"/><file name="iframe.phtml" hash="98bf78b0fe4b2145234b95ff4a80a28a"/><file name="info.phtml" hash="c13343a24ad9f83112150d2866394fe6"/><file name="js.phtml" hash="3ee384e12c675cdeb4b4d51b5d2dd966"/><file name="redirect.phtml" hash="23ac952dbe2d60af777b9ff9d2b5fa5c"/><dir name="review"><file name="button.phtml" hash="6f5d67de45715b72aa0f6a2e979ee36f"/></dir></dir><dir name="partner"><file name="logo.phtml" hash="d454ea6add05946129aebe9bf192914c"/></dir><dir name="payment"><file name="mark.phtml" hash="72e4396194a11c1f719beccf9bc6f7e1"/><file name="redirect.phtml" hash="56eb97e5cc5fc7b52afa24c7d9bd9923"/></dir></dir><dir name="poll"><file name="active.phtml" hash="1f34206ccfef5b923801a26c856a22fb"/><file name="result.phtml" hash="ac63c105a6af2ffa2742a3476cad818e"/></dir><dir name="productalert"><file name="price.phtml" hash="c8969339e69c74358411bcee88049450"/><dir name="product"><file name="view.phtml" hash="c15d159ef6371f7bf9f6ffcfed32d5ca"/></dir><file name="stock.phtml" hash="c8969339e69c74358411bcee88049450"/></dir><dir name="rating"><file name="detailed.phtml" hash="b2f22bc638815ad582ad8652548ccb4a"/><file name="empty.phtml" hash="6ebb3248e512dc6d2b2e4d738ca22f08"/></dir><dir name="reports"><file name="home_product_compared.phtml" hash="2ece5a9d7f80afb48b1f0b0c93cff90f"/><file name="home_product_viewed.phtml" hash="01571b50f8ef03d5a3977635333c1f2a"/><file name="product_compared.phtml" hash="35f797c8c86aa17ca542f1d8b1165645"/><file name="product_viewed.phtml" hash="3e6f3dc74bda30ce3e6bcae17f5de294"/><dir name="widget"><dir name="compared"><dir name="column"><file name="compared_default_list.phtml" hash="325341cf6a2e594b0596008c909437cf"/><file name="compared_images_list.phtml" hash="9f56ccde19aba6ffd6a4b6dfdd099e2c"/><file name="compared_names_list.phtml" hash="2e260b9830d27d4199168c0e120cb99b"/></dir><dir name="content"><file name="compared_grid.phtml" hash="5b70f900e852e27f53be1f34e95a6ca3"/><file name="compared_list.phtml" hash="38f88a0f81add95a2833a4e1f313916a"/></dir></dir><dir name="viewed"><dir name="column"><file name="viewed_default_list.phtml" hash="53b58e14ef7bfdd3d818190be83aaa32"/><file name="viewed_images_list.phtml" hash="acd60dbf56839ceb6a368afd86b9148b"/><file name="viewed_names_list.phtml" hash="485e7d05e2604eaf2ce97de8c790f0d1"/></dir><dir name="content"><file name="viewed_grid.phtml" hash="2e4de00c928a2c602181bc85e11334b4"/><file name="viewed_list.phtml" hash="4f322cb3030989a7d26ad2a6852d6958"/></dir></dir></dir></dir><dir name="review"><dir name="customer"><file name="list.phtml" hash="f61e58bf73b5d7f78beecb9b4f4a11fa"/><file name="recent.phtml" hash="98857e3f1630eb5efc73aab1d3b783b7"/><file name="view.phtml" hash="eb2f4cb20daeeda670414ef951992487"/></dir><file name="form.phtml" hash="256e85355c8037b774b10bc369ce4f7d"/><dir name="helper"><file name="summary.phtml" hash="d9bddcd52cd9df8fde9ba303c41f2c5b"/><file name="summary_short.phtml" hash="c17ab4528915fcec22bb124090bbce51"/></dir><dir name="product"><dir name="view"><file name="count.phtml" hash="ca531d967cb665afd6cd48dd8ba84599"/><file name="list.phtml" hash="48d34fe4a0f7169612d27ce58ae44855"/><file name="other.phtml" hash="bff0e5fe61dcdbc705621c56c9c51836"/></dir></dir><file name="view.phtml" hash="114a8123eac95fa4eded1fcefcf4039a"/></dir><dir name="rss"><file name="list.phtml" hash="40f73dff24c48b7ba3b9ebb05821724e"/><file name="nofeed.phtml" hash="e9a0bc75908ef6c91da02f75d338a2c6"/><dir name="order"><file name="details.phtml" hash="c2a96b32506b8a84c385df94928628ff"/></dir></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="view.phtml" hash="8a6337661761abda5dd78846bde35152"/></dir><file name="agreements.phtml" hash="e4fce07c984345aff8d48fd630e3271e"/></dir><dir name="order"><file name="comments.phtml" hash="28ea4067e129fd11ad7e27e8c14fa212"/><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="b42a89a8a8c0e26c638b61e73fbf5311"/></dir></dir><file name="items.phtml" hash="ff388028e3e4dfee8d41156b51d49ec8"/></dir><file name="creditmemo.phtml" hash="99a193d26bdb55c04864a5d21565dbd0"/><file name="details.phtml" hash="eb3903e933539f698274e85d250de75a"/><file name="history.phtml" hash="f56dfb6fc07b580db59cdb66f788df13"/><file name="info.phtml" hash="baa0645d4aa9db792f303bcd7c5083f6"/><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="71f7442af37e1d68bb2d63654db7b445"/></dir></dir><file name="items.phtml" hash="73ad00dc74ae1c29dd05ebb27a205de6"/></dir><file name="invoice.phtml" hash="a51b3a4fdff14c6edbc297840b60a64f"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="905c24c6c726eb9f7ed40ea3352641de"/></dir></dir><file name="items.phtml" hash="2a5a22209fea120b7119f9dca26c1750"/><dir name="print"><file name="creditmemo.phtml" hash="9a4fad195906932cfd4905578ce8deed"/><file name="invoice.phtml" hash="6439df835e2204a4e455839de415b27b"/><file name="shipment.phtml" hash="6014d448372c8630ecbfee3a72ac224c"/></dir><file name="print.phtml" hash="d3affa860cd9d00bd2d3dc342913edad"/><file name="recent.phtml" hash="fd6a525bac66c165b799a65e3b1ffe90"/><dir name="shipment"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="6dc5f3dd68f331b2e7f02132d74e1ba7"/></dir></dir><file name="items.phtml" hash="b9975d8a958498db00a9177aab4a9cad"/></dir><file name="shipment.phtml" hash="2561ff58af6b570616fc1b2aa43b3158"/><file name="totals.phtml" hash="77d4b7ee57cf4c0e66a2313c70f66673"/><file name="trackinginfo.phtml" hash="c495aa8788e33c89e125a05ca64ce350"/><file name="view.phtml" hash="472ec4b462df08c522d01496f9c3c766"/></dir><dir name="payment"><dir name="form"><dir name="billing"><file name="agreement.phtml" hash="4916766f5b43ea30d3765bdc80bc477c"/></dir></dir></dir><dir name="recurring"><file name="grid.phtml" hash="bca022b5dbeca3e73dfb3621ca5277c7"/><dir name="profile"><dir name="view"><file name="info.phtml" hash="6cfee00ea569907133d2c28d54ce45f2"/></dir><file name="view.phtml" hash="28060a87cf637c738ae0b635e7325b56"/></dir><file name="profiles.phtml" hash="bb6cceaeb8361b2c092f6008b343eb82"/></dir><dir name="reorder"><file name="sidebar.phtml" hash="8e9290899fc0f7df0320b03604d04b23"/></dir></dir><dir name="sendfriend"><file name="send.phtml" hash="ee5c8b9cbebde55ef364b77137c0965a"/></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="8d6874fe146c349c8226810b9e3b396e"/><file name="popup.phtml" hash="ebc96e0f900a1e1d4c81eb991063acaf"/></dir></dir><dir name="tag"><file name="cloud.phtml" hash="cca2ca73af05a06ab07fa44e51693837"/><dir name="customer"><file name="recent.phtml" hash="3ba4a010b9d2e18ab30f43a0b83ccf8f"/><file name="tags.phtml" hash="983e645203ddd887e5dd997e9f39a476"/><file name="view.phtml" hash="7e1bcc2116177dae1ea6c758fae8bb23"/></dir><file name="list.phtml" hash="fcb18cee63ce68746f39ed9c2ef37fcb"/><file name="popular.phtml" hash="e246d39b628528f52142da117c226cc2"/></dir><dir name="tax"><dir name="checkout"><file name="discount.phtml" hash="3b96e530c70ce5f3bd004135ba61c2c4"/><file name="grandtotal.phtml" hash="ba6b5536788eaf9eb0ec63c0d27244e2"/><file name="shipping.phtml" hash="8c1db8bd0d0b4e8020dee9223551d206"/><file name="subtotal.phtml" hash="e040df05e8ff4bcb634d6f12c16e7cee"/><file name="tax.phtml" hash="7badca0eab345b5408076b913bb3c9f9"/></dir><dir name="order"><file name="tax.phtml" hash="0dec7e22802cc727d4228daa77e55d04"/></dir></dir><dir name="wishlist"><dir name="email"><file name="items.phtml" hash="3d3fd9a8a6f789efcbb169d207a0fb78"/><file name="rss.phtml" hash="8a3ed61790d4abc2b5e52e6c57f2aecc"/></dir><dir name="item"><dir name="configure"><file name="addto.phtml" hash="1eb870482a75ad57d8ed9b5eb94f71f5"/></dir></dir><file name="options_list.phtml" hash="e916d29bc94035c68afb93e011d91953"/><dir name="render"><dir name="item"><file name="price.phtml" hash="857cbde625af4ca534355c2df8e79d5f"/></dir></dir><file name="shared.phtml" hash="ae94d9701b8f96a6fc8e431d3b6b3220"/><file name="sharing.phtml" hash="5850ae6c6122db12f9392be158a41465"/><file name="sidebar.phtml" hash="cd3e258e14373fb99a9519f02d7dac29"/><file name="view.phtml" hash="b1ccec5396301d9bbf96c790c34a9475"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="widgets.css" hash="e70fb7758b1fd50bd3f30079f484bb51"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><dir name="images"><file name="calendar.gif" hash="b1468e5239504974c689eea5d93f86d4"/><dir name="catalog"><dir name="product"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><dir name="cookies"><file name="firefox.png" hash="425e1b2ddc38c0bba431fb54357c66a4"/><file name="ie6-1.gif" hash="5c27700e245762bc89ed8c3ee7183f21"/><file name="ie6-2.gif" hash="d8c55e15e1f711e5c259300a9c19551b"/><file name="ie7-1.gif" hash="d61edcc8a514a3c81ea116b7d38ddcb6"/><file name="ie7-2.gif" hash="0526a654e94c54866cad977c0a47d3e5"/><file name="ie7-3.gif" hash="4fb142def3f6cfd8d8d23e1315528a1e"/><file name="ie7-4.gif" hash="575c276231c6a91e28935ec98215e146"/><file name="ie7-5.gif" hash="3ae5fcc11fe89da91674d183872337c1"/><file name="ie7-6.gif" hash="95a4981a41785a8cde273c9b2edbfbc7"/><file name="opera.png" hash="34070d92180d4ee0e37b1dd8bb731cd7"/></dir><file name="cvv.gif" hash="ed0f392004a405466291071a760b285d"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><dir name="widgets"><file name="i_block-list.gif" hash="fe8424127ecbe4b0d893bcf6f253dc1a"/><file name="i_widget-link.gif" hash="1bf753578171f147f0203e7b13bdd0c4"/><file name="i_widget-new.gif" hash="a75377ffed51b711cbc608ffaa1a2e7d"/></dir></dir><dir name="js"><file name="bundle.js" hash="74522e4b99d5496741fc4928cf817ad8"/><dir name="checkout"><file name="review.js" hash="81d77e0603f298e0f6a8a3cac5207d0e"/></dir><file name="giftmessage.js" hash="e14cb030c6e98e458bd8beda081e270e"/><file name="ie6.js" hash="0e37d39bbb8b3ec9e96786b303918517"/><file name="opcheckout.js" hash="9afed349f14e48998a0e0904afb02f27"/></dir></dir></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.5.0.0</min><max>1.6.0.0</max></package></required></dependencies>
-</package>
diff --git a/var/package/Interface_Frontend_Default-1.5.0.0.xml b/var/package/Interface_Frontend_Default-1.5.0.0.xml
deleted file mode 100644
index d45082cbae..0000000000
--- a/var/package/Interface_Frontend_Default-1.5.0.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Interface_Frontend_Default</name>
-    <version>1.5.0.0</version>
-    <stability>stable</stability>
-    <license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Default interface for Frontend</summary>
-    <description>Default interface for Frontend</description>
-    <notes>1.5.0.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:00:55</time>
-    <contents><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="etc"><file name="widget.xml" hash="9cc6702819c41749c9309eafd560a610"/></dir><dir name="locale"><dir name="en_US"><file name="translate.csv" hash="793e1ff86039f24caff6fad87a094fa1"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="css"><file name="print.css" hash="8fb2acea15ecc5730319fc4b9f45336b"/><file name="styles-ie.css" hash="b354e9a4bb740b16aa5920369b227027"/><file name="styles.css" hash="2aef35d8e86099243eed754630ff8437"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><dir name="images"><file name="best_selling_tr_even_bg.gif" hash="5022d648379090e306f00cd64738b146"/><file name="best_selling_tr_odd_bg.gif" hash="926622704f53796801bb5d097e116c8e"/><file name="bkg_account_box.gif" hash="dd98174b6e3e5605a3f9551a59c66841"/><file name="bkg_block-actions.gif" hash="da2970eac0a22c850b19ee3680475d51"/><file name="bkg_block-currency.gif" hash="bfaad1b64557c05ad6f4b124ad3d3532"/><file name="bkg_block-layered-dd.gif" hash="6ae6f8184e87de496fb74eeec65737c9"/><file name="bkg_block-layered-dt.gif" hash="ba8229068657b80f2c42111c5a1a307e"/><file name="bkg_block-layered-label.gif" hash="14687dfa3921cfd12d2149c1497d9765"/><file name="bkg_block-layered-li.gif" hash="753ebb76a4fc2b5b6915c536fcf4d487"/><file name="bkg_block-layered-title.gif" hash="c92e29b30af7abf4e0bc3f714a246f55"/><file name="bkg_block-layered1.gif" hash="607167f198572e83a0e728b6b9383a70"/><file name="bkg_block-title-account.gif" hash="a64f1df5a7e3d0f6a58b017f74311cb1"/><file name="bkg_block-title.gif" hash="f8c1f130ad69464fe7aff2f589b2ec75"/><file name="bkg_body.gif" hash="82bfc5bfe346c8e974cd33b1314b0acf"/><file name="bkg_buttons-set1.gif" hash="2c641e927bc83156b7004ea37920513c"/><file name="bkg_checkout.gif" hash="11258fe49feff5513c9608f2ea486776"/><file name="bkg_collapse-gm.gif" hash="37418f23e65006dcfde07ce9b249e057"/><file name="bkg_collapse.gif" hash="2333c68e38163ed4656da82b9bcf362b"/><file name="bkg_divider1.gif" hash="260ebae91ffb1b7c663906b29a069925"/><file name="bkg_form-search.gif" hash="2ca36eb80ea705e063409153f3821f78"/><file name="bkg_grand-total.gif" hash="10f1c3d82d78170706fa3e9c4baa7e04"/><file name="bkg_grid.gif" hash="a6f64fedbac51fb1b86184cd488cc4e6"/><file name="bkg_header.jpg" hash="0211c47be1493bd0ec72949c47932b81"/><file name="bkg_login-box.gif" hash="5538675d7f1c35d96a2b8013948f42a6"/><file name="bkg_main1.gif" hash="a8f5717873dc6cf8f6bd22924b5838fe"/><file name="bkg_main2.gif" hash="cf18ba9f7c7e6b058b439cde1a897e9c"/><file name="bkg_nav0.jpg" hash="f9ac3f31e293cf075471d2d3fe07353a"/><file name="bkg_nav1.gif" hash="f4e26840c8cca0e74aba5b810341c5c0"/><file name="bkg_nav2.gif" hash="a64c8f5165b239e432d26a62ae5f79b6"/><file name="bkg_opc-title-off.gif" hash="f69b40b5331ab3760f54d038daf287eb"/><file name="bkg_pipe1.gif" hash="7852290f6a443000ead96b8cec5cd7c7"/><file name="bkg_pipe2.gif" hash="7da64eefaf4da3855ab6ee76dbced0c2"/><file name="bkg_pipe3.gif" hash="11bfac1e590f0c77fb12f37d7f05cd3c"/><file name="bkg_product-view.gif" hash="7078a7f2827156d5ae0a1cb59da3c418"/><file name="bkg_product_collateral.gif" hash="1d4d6b22e5108aefae52709d3934f397"/><file name="bkg_rating.gif" hash="0a8777c815350ddf1e316a537ad0c335"/><file name="bkg_sp-methods.gif" hash="17d68b5449adaa87dafc62ae0afa1b9a"/><file name="bkg_tfoot.gif" hash="da2970eac0a22c850b19ee3680475d51"/><file name="bkg_th-v.gif" hash="b0d17555dfc6060941e0c067718189df"/><file name="bkg_th.gif" hash="f249911b08f2822fc0b561b7f98575d2"/><file name="bkg_toolbar.gif" hash="fb7ed019476eaa1643af922b59ede4fb"/><file name="btn_checkout.gif" hash="d2060501e14e86c29e28137130e5726e"/><file name="btn_edit.gif" hash="df3565eb4e4d0dc578201df60de54b47"/><file name="btn_gm-close.gif" hash="346e26eece27449a2f224aef76ae372e"/><file name="btn_google_checkout.gif" hash="843d75249ce05b5d87ca5419f37b1c3b"/><file name="btn_paypal_checkout.gif" hash="6edd61270b7b5632eafad10557129114"/><file name="btn_place_order.gif" hash="d35219f86ae2c983ee1a31557e37b612"/><file name="btn_proceed_to_checkout.gif" hash="4daac687b514fecfd1068539500ac3d7"/><file name="btn_proceed_to_checkout_dis.gif" hash="9e152c01d5d88f690dc52cb62428f3b6"/><file name="btn_remove.gif" hash="6182e723aa2a253dc6cf334a3dfaaa84"/><file name="btn_remove2.gif" hash="234bddc4c5878c5ef16407a944824236"/><file name="btn_search.gif" hash="2d93b43c0a1c1182358677661e26a978"/><file name="btn_trash.gif" hash="bcb22f558a0eb32243a2a36645189e9f"/><file name="btn_window_close.gif" hash="c83f3cbbb2aedfc580dff78d5cfb63ed"/><file name="calendar.gif" hash="b1468e5239504974c689eea5d93f86d4"/><dir name="catalog"><dir name="product"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><file name="cvv.gif" hash="ed0f392004a405466291071a760b285d"/><file name="cvv.jpg" hash="e27210d810bbab732935d9410936ef87"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="free_shipping_callout.jpg" hash="cbf2e494ef7ca50acf8826321d739559"/><file name="grid-cal.gif" hash="b1468e5239504974c689eea5d93f86d4"/><file name="home_left_callout.jpg" hash="ee99a5586cf52e85c986d1275958a7da"/><file name="home_main_callout.jpg" hash="e6d1c119d5b24a5916fe394cb4b5cdc3"/><file name="i_arrow-top.gif" hash="3dbb0584e8eb1d96cc3d3c40c17d7aaf"/><file name="i_asc_arrow.gif" hash="40aa554212d6a1f60593c27d78d85fa3"/><file name="i_availability_only.gif" hash="bca1f00a50864171ad98317b778e869c"/><file name="i_availability_only_arrow.gif" hash="0cf32b72fefc94b89b74e4f3f02c2e93"/><file name="i_block-cart.gif" hash="cc19e21f9c89b70cc10354ff588ca8ab"/><file name="i_block-currency.gif" hash="643024bcae5ece554fdbbc041aeb297c"/><file name="i_block-list.gif" hash="fe8424127ecbe4b0d893bcf6f253dc1a"/><file name="i_block-poll.gif" hash="52d778dddbf48b8d04226bee9370a7ef"/><file name="i_block-related.gif" hash="4e277173b6372b1a90b0f19e0388ad54"/><file name="i_block-subscribe.gif" hash="9e5fee06a543742045118a95f2debcb8"/><file name="i_block-tags.gif" hash="67d1255c2c3e9ed1a5c845f8d4e4a3ba"/><file name="i_block-viewed.gif" hash="67d1255c2c3e9ed1a5c845f8d4e4a3ba"/><file name="i_block-wishlist.gif" hash="8f8cda89ca20ba4a9b2f8c91f73fdff9"/><file name="i_desc_arrow.gif" hash="92fd194bfae4ce5ae3354e1e47d7ac7d"/><file name="i_discount.gif" hash="908d44da90de5e54185764d093bbdb77"/><file name="i_folder-table.gif" hash="bf006ddb591d8ac95d2e895bf2fdbc8d"/><file name="i_ma-info.gif" hash="91259557447ee80eb1110fe0c85cb3b5"/><file name="i_ma-reviews.gif" hash="859c97695ec396c0b284a0c3c7c416ad"/><file name="i_ma-tags.gif" hash="1e83e3b0b677c92b3aa8a252268f7b86"/><file name="i_msg-error.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="i_msg-note.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="i_msg-success.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="i_notice.gif" hash="ebd56dc80b8346e10e93628bc0e6c372"/><file name="i_page1.gif" hash="704f7d4eccbdf9cabbad7770f18856ff"/><file name="i_page2.gif" hash="57a04ca584e05e28dc94c7e68f0af62e"/><file name="i_pager-next.gif" hash="ed4d6640624c2b6edeab4c212314bd6d"/><file name="i_pager-prev.gif" hash="75973b020105dccbaf34e49d7852552d"/><file name="i_print.gif" hash="0aed138181495642e9ab29e55d194d40"/><file name="i_rss-big.png" hash="6cf70e7c52a3f3d7b833ccadb041a555"/><file name="i_rss.gif" hash="e5bbc388d818c142868b4a1df0b48793"/><file name="i_search_criteria.gif" hash="cf67b9cc5c311ae3f99e68cd29ae17be"/><file name="i_shipping.gif" hash="91a0d2cc2eb2391f90ec8a75c04b3183"/><file name="i_tag_add.gif" hash="a736baa992aa55b6fb71e8742a04dc82"/><file name="i_tier.gif" hash="c5189e25afeb7c1a8c4902a42832593e"/><file name="i_type_grid.gif" hash="a1e5d8ac36fb2891ea16e729b95c552c"/><file name="i_type_list.gif" hash="61333d383ec142b8d270abe77324aa5d"/><file name="logo.gif" hash="48b7eb03807fdf80bdfb19b872cf84b8"/><file name="logo_email.gif" hash="8de347192e0524cff7a69e4020182dbd"/><file name="logo_print.gif" hash="8de347192e0524cff7a69e4020182dbd"/><file name="magnifier_handle.gif" hash="238fbdd7959f517db11c6f57ee4daaf4"/><dir name="media"><file name="404_callout1.jpg" hash="834e53a03e2921a2fd3c135c0c7189df"/><file name="404_callout2.jpg" hash="016984b4a1579df34147f9407098db73"/><file name="about_us_img.jpg" hash="726f36dd75b5a709a1a14acab1660188"/><file name="best_selling_img01.jpg" hash="5e7337a4061a636df8ee4bf979a092ac"/><file name="best_selling_img02.jpg" hash="b9a49c0964938ec72fb834cb166b9352"/><file name="best_selling_img03.jpg" hash="e3581487fb4589baecc553f2ce8d5247"/><file name="best_selling_img04.jpg" hash="7e59bf99f5f813e327595c52d3320174"/><file name="best_selling_img05.jpg" hash="e396892daec7ffcf7244082b3e596911"/><file name="best_selling_img06.jpg" hash="2702839637efbe0fd0a4bad41cd6a551"/><file name="cell_phone_landing_banner1.jpg" hash="b25562360fc470f1091ca7ea014a3290"/><file name="col_left_callout.jpg" hash="5f762006021e046f9bd536f37ea7c463"/><file name="col_right_callout.jpg" hash="dae22f37a542da272a35195ec286ec25"/><file name="electronics_cellphones.jpg" hash="8f6badbc32ce806c6109c788df6ef5e9"/><file name="electronics_digitalcameras.jpg" hash="953b8d7db6f0bdcd53b1d6b1386962b9"/><file name="electronics_laptops.jpg" hash="e050e92d72000e6bdc763a7b5888ec8a"/><file name="furniture_callout_spot.jpg" hash="28edc7d72486ab2362324995550d87af"/><file name="furnitures_bed_room.jpg" hash="b8616c5bffc23a92d2a1c97dae57b262"/><file name="furnitures_living_room.jpg" hash="2663737f3997cb1a49ce24d07dc8aefb"/><file name="head_electronics_cellphones.gif" hash="a69425966444ea597fb7c629114d5165"/><file name="head_electronics_digicamera.gif" hash="bde3cec3fc16b2d0ae57e7783eb00652"/><file name="head_electronics_laptops.gif" hash="b2c55387ffa92277315bdedeb4cb9b8f"/><file name="laptop_callout_mid1.jpg" hash="4ffb50bd3b7b32a78fd059b1571c202e"/><file name="laptop_callout_mid2.jpg" hash="662cf3881b06b090e9500496b19b03e4"/><file name="laptop_callout_mid3.jpg" hash="22aa71ecfe0aa9b6936a1eddb62d889e"/><file name="laptop_callout_spot.jpg" hash="2e469d1bd871355eaef6076487a973db"/><file name="shirts_landing_banner1.jpg" hash="4acc8620b009d835e5c25587671ea25d"/></dir><file name="np_cart_thumb.gif" hash="e9fdd943e0947e15f0638506f477e358"/><file name="np_more_img.gif" hash="ace357bfe3e81ffb62137cd5b25ae5e1"/><file name="np_product_main.gif" hash="d0cccda76de50efa025215ce85dacb1c"/><file name="np_thumb.gif" hash="e46270c89358ecc8341d1565c14644b8"/><file name="np_thumb2.gif" hash="8502866cdabc5c74aca7d7bd32a06a03"/><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/><file name="pager_arrow_left.gif" hash="75973b020105dccbaf34e49d7852552d"/><file name="pager_arrow_right.gif" hash="ed4d6640624c2b6edeab4c212314bd6d"/><file name="ph_callout_left_rebel.jpg" hash="0ce8ad0026d8b8a83ed7acdf6209129b"/><file name="ph_callout_left_top.gif" hash="f17a036d75e5065eb76bafbb2c8ad7ff"/><file name="product_zoom_overlay_magnif.gif" hash="83834893e162221d6d9257fe67847370"/><file name="slider_bg.gif" hash="87bc1b46d87de4f6252c7216216627c3"/><file name="slider_btn_zoom_in.gif" hash="ef0fc67f77f30827ee67f4e744b60781"/><file name="slider_btn_zoom_out.gif" hash="68b3d1c28dc5aec4f6b64d70a6996b6f"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/><dir name="xmlconnect"><dir name="catalog"><dir name="category"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><file name="tab_account.png" hash="0498d73e47ed47179e5546dc15c17dc7"/><file name="tab_cart.png" hash="9055ba76e256a51d3fee53a8c41d5226"/><file name="tab_home.png" hash="07d0af93e167b9366d3d4fb3d6cdb31c"/><file name="tab_more.png" hash="b9fc21feb8d7655bc9c2985c37b0de2f"/><file name="tab_page.png" hash="ca05dbc42f944b8d4255f6675f6dd93a"/><file name="tab_search.png" hash="25e880eb2a4d06828e2e1c3f32d22400"/><file name="tab_shop.png" hash="fe602fc2e7093efef5ecc0b027a32d91"/></dir></dir></dir></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.5.0.0</min><max>1.6.0.0</max></package></required></dependencies>
-</package>
diff --git a/var/package/Interface_Install_Default-1.5.0.0.xml b/var/package/Interface_Install_Default-1.5.0.0.xml
deleted file mode 100644
index 28174efe66..0000000000
--- a/var/package/Interface_Install_Default-1.5.0.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Interface_Install_Default</name>
-    <version>1.5.0.0</version>
-    <stability>stable</stability>
-    <license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Default interface for Install</summary>
-    <description>Default interface for Install</description>
-    <notes>1.5.0.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:00:58</time>
-    <contents><target name="magedesign"><dir name="install"><dir name="default"><dir name="default"><dir name="layout"><file name="main.xml" hash="53cc5031c592e2c4f6083710eb4a774e"/></dir><dir name="template"><dir name="install"><file name="begin.phtml" hash="09a3002ae6b1c0ca1da93c15858b1ddb"/><file name="config.phtml" hash="0be5a19fa0f0d55ee3274c269e36807f"/><file name="create_admin.phtml" hash="ce87d731454e540daa613492ae8f9626"/><file name="download.phtml" hash="b0ae018ab7ce212fe19ed0f0c5349520"/><file name="end.phtml" hash="f97b6c65cafc36cfbbe8e02e77687d02"/><file name="locale.phtml" hash="fd39dcd4e715201d0cfef357280083fa"/><file name="state.phtml" hash="1c7024fa9eaa396951a5c874c9bdcad3"/></dir><file name="page.phtml" hash="2ae91162a221367dc70fce9f2e8c7a27"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="install"><dir name="default"><dir name="default"><dir name="css"><file name="boxes.css" hash="31da7dcdca502c3fca21cbddc160f581"/><file name="clears.css" hash="4018383aa0ccf4a455b30714905d53a5"/><file name="ie7minus.css" hash="b973a69ca4e691f21ee58b258f5bf12c"/><file name="iestyles.css" hash="7fd4d1acd42b155b7b7ae10272b235d6"/><file name="reset.css" hash="e9397eec4802597f92bf50ccd982f840"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><dir name="images"><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="footer_bg.gif" hash="d59784af16fd95ea82226e5708a89232"/><file name="footer_container_bg.gif" hash="d468e3943943cbbf711586e69d40ca42"/><file name="footer_info_separator.gif" hash="7da64eefaf4da3855ab6ee76dbced0c2"/><file name="footer_informational_bg.gif" hash="72d37f4b2ea747bf8969c2654ad1d1e0"/><file name="footer_left.gif" hash="2b15a54bea9409a75c142d14a62f0149"/><file name="footer_legality_bg.gif" hash="4eb1602e3369dccd901ffe98ea0fd4b3"/><file name="footer_right.gif" hash="a45eaf35c8797d299bd4d9b936528e8f"/><file name="header_bg.gif" hash="795c6de754d0d49717ed08d5cd8168c8"/><file name="header_nav_bg.gif" hash="80c6a18686eb0243e06d6176506a2502"/><file name="header_top_bg.jpg" hash="143f524392ee62fcc8183f5930d7258b"/><file name="header_top_container_bg.jpg" hash="294c18f3f6b838bba06ae41dd3c3d638"/><file name="i_notice.gif" hash="ebd56dc80b8346e10e93628bc0e6c372"/><file name="logo.gif" hash="48b7eb03807fdf80bdfb19b872cf84b8"/><file name="main_bg.gif" hash="cf18ba9f7c7e6b058b439cde1a897e9c"/><file name="main_container_bg.gif" hash="a8f5717873dc6cf8f6bd22924b5838fe"/><file name="note_msg_icon.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/></dir></dir></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.5.0.0</min><max>1.6.0.0</max></package></required></dependencies>
-</package>
diff --git a/var/package/Lib_Google_Checkout-1.5.0.0.xml b/var/package/Lib_Google_Checkout-1.5.0.0.xml
deleted file mode 100644
index 2f898c4968..0000000000
--- a/var/package/Lib_Google_Checkout-1.5.0.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Lib_Google_Checkout</name>
-    <version>1.5.0.0</version>
-    <stability>stable</stability>
-    <license>Apache License</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Google Checkout Library</summary>
-    <description>Google Checkout Library</description>
-    <notes>1.5.0.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:00:58</time>
-    <contents><target name="magelib"><dir name="googlecheckout"><file name="googlecart.php" hash="5b11319b8489cd2cb50bf2f38797fbb0"/><file name="googleitem.php" hash="2305b454c0b524f835e489a224070c1b"/><file name="googlelog.php" hash="402dfa7bf30450451d6dd76db20e8996"/><file name="googlemerchantcalculations.php" hash="2b8ca5d31c7dfc5f1b305ad0f0f8dc8d"/><file name="googlerequest.php" hash="2d9f2ffdb96c38f57772c151f517fe4c"/><file name="googleresponse.php" hash="4af0da6d2d9f461e9e072a81512a205e"/><file name="googleresult.php" hash="9643ea49bfeb16224f43a8ea79571094"/><file name="googleshipping.php" hash="ba2aa1ce3d1375b48a214fba19f589ff"/><file name="googletax.php" hash="55b8cd73340e491a47f62f8b887404ed"/><dir name="xml-processing"><file name="gc_xmlbuilder.php" hash="8b008a09d4ff42408fb601980f965dac"/><file name="gc_xmlparser.php" hash="9845e8a617eef46f0209140c9f26a90b"/></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
-</package>
diff --git a/var/package/Lib_Js_Calendar-1.51.1.xml b/var/package/Lib_Js_Calendar-1.51.1.xml
deleted file mode 100644
index 4e9cc67176..0000000000
--- a/var/package/Lib_Js_Calendar-1.51.1.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Lib_Js_Calendar</name>
-    <version>1.51.1</version>
-    <stability>alpha</stability>
-    <license>Mixed</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Javascript Calendar for Magento</summary>
-    <description>Javascript Calendar for Magento</description>
-    <notes>1.51.1</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2010-12-17</date>
-    <time>2010-12-17</time>
-    <contents><target name="mageweb"><dir name="js"><dir name="calendar"><file name="calendar-blue.css" hash="b8bb29e3c1573d0d2917cd3112b5052d"/><file name="calendar-blue2.css" hash="654dfacebcdd70c75ccaf2b4aee2d059"/><file name="calendar-brown.css" hash="f326a6a84037e549a9cd71a92346f210"/><file name="calendar-green.css" hash="b44e2c25ff56efaa6e37d84df202e5d5"/><file name="calendar-setup.js" hash="0c21b9e48ecfad87b4c4885cfb1aca8d"/><file name="calendar-system.css" hash="9b446e2ee0e9e4420fce20922405cec7"/><file name="calendar-tas.css" hash="fa3baa9367504954ef03c1f05d44f1a6"/><file name="calendar-win2k-1.css" hash="e3c61212e6abc28844005381d8fe9690"/><file name="calendar-win2k-2.css" hash="332d8bc7dab6acd575dba49a15b62947"/><file name="calendar-win2k-cold-1.css" hash="b0810ce949e6c954c54053c52b21e74a"/><file name="calendar-win2k-cold-2.css" hash="3487ec4e054141057673d794ce6d1032"/><file name="calendar.js" hash="da368ae872efbf2394fbc9daadc4ab35"/><file name="img.gif" hash="c1e5255bd358fcd5a0779a0cc310a2fe"/><file name="menuarrow.gif" hash="b5a91d7a2755198b2eb729541ad3288c"/><file name="menuarrow2.gif" hash="1f8c673c8f76832febaeeac88a5f4353"/><dir name="skins"><dir name="aqua"><file name="active-bg.gif" hash="f8fb9f2b7428c94b41320aa1bc9cf601"/><file name="dark-bg.gif" hash="949f6a11667cbdfbb96f8986464ba81b"/><file name="hover-bg.gif" hash="803ac4dbc56c05739f515d6ac6a66163"/><file name="menuarrow.gif" hash="1f8c673c8f76832febaeeac88a5f4353"/><file name="normal-bg.gif" hash="851134e42206fd3b173a3db654981bb6"/><file name="rowhover-bg.gif" hash="c097de7289bcf68723e89c248b9a2749"/><file name="status-bg.gif" hash="123882ca533030f07ee55c3818fc46b9"/><file name="theme.css" hash="ec69465f70d45213258fe1f89c52eceb"/><file name="title-bg.gif" hash="8d652fc5b683706fcbbf1103131c6ac2"/><file name="today-bg.gif" hash="9befc7d912cad22ddf2ec3fc21188bfd"/></dir></dir></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
-</package>
diff --git a/var/package/Lib_Js_Ext-1.5.0.0.xml b/var/package/Lib_Js_Ext-1.5.0.0.xml
deleted file mode 100644
index dde5a2f5d7..0000000000
--- a/var/package/Lib_Js_Ext-1.5.0.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Lib_Js_Ext</name>
-    <version>1.5.0.0</version>
-    <stability>stable</stability>
-    <license>Mixed</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Extjs Javascript Libraries for Magento</summary>
-    <description>Extjs Javascript Libraries for Magento</description>
-    <notes>1.5.0.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:00:58</time>
-    <contents><target name="mageweb"><dir name="js"><dir name="extjs"><dir name="css"><file name="README.txt" hash="66440774774ca4995ad5137ac9ae48e0"/><file name="basic-dialog.css" hash="8fefe8397b484ac4855de7232d00fc5d"/><file name="box.css" hash="e042e86fe72ac68849bb2c927d1b94be"/><file name="button.css" hash="0baa72e592fb9cfddb48491ce74040c2"/><file name="combo.css" hash="5f3457b94b882c6037da7b62b10fd50b"/><file name="core.css" hash="49c87f77493ccaa4867c4c4b54e2f297"/><file name="date-picker.css" hash="cb973d925a5fe95e3a8a23393b9db283"/><file name="dd.css" hash="67c5b243c56a99eb1bdbd4d57fea7ce1"/><file name="debug.css" hash="e22d97cc54ad2f42b4f06daa921da622"/><file name="editor.css" hash="ab513287f9e04386f48980e399d4a0b1"/><file name="ext-all.css" hash="e5acad04d0e7877b829bac608437522c"/><file name="form.css" hash="22877998588bc093dcf9375b8707079c"/><file name="grid.css" hash="79cefd1763bb64802f99177f233bd676"/><file name="layout.css" hash="2ba12ec3ceff9989de97e02296c94281"/><file name="menu.css" hash="13b8de4d5f155bb5d526318431b8317f"/><file name="panel.css" hash="fb6624b2dfc4ef99e08bc11eac723e20"/><file name="qtips.css" hash="67b76bbd4ad59a7341ed74a07c8e2524"/><file name="reset-min.css" hash="9c797c4b3949999b27f0e4108132cb57"/><file name="resizable.css" hash="2271ebacebaa1e429d42ba09da460647"/><file name="tabs.css" hash="d19d0773d75a9e2fe2032b1c35a22161"/><file name="toolbar.css" hash="ff85187d3b869bf3b98a72db95fca184"/><file name="tree.css" hash="d8a55f993187bc822efc5beb03722369"/><file name="ytheme-aero.css" hash="e555e0439f7fc0a43de37784e3df23c6"/><file name="ytheme-gray.css" hash="9d08035f3b052a9c604b0116f9a6c0be"/><file name="ytheme-vista.css" hash="8b13f7980b254be7e7c54abc0d8dcc3f"/></dir><file name="ext-tree-checkbox.js" hash="b9d12cc79c28a69f86390a0c52f4b9c7"/><file name="ext-tree.js" hash="b17548cc4ae4a2585d63ae76a178794d"/><dir name="resources"><dir name="css"><file name="README.txt" hash="66440774774ca4995ad5137ac9ae48e0"/><file name="basic-dialog.css" hash="4cc973c87f79ea230f372cea597963ba"/><file name="box.css" hash="3809db7ee254d629d52dba0aad472d35"/><file name="button.css" hash="d3f29c8497579832fe5d7aafff7c3544"/><file name="combo.css" hash="483a1a701ca9c7db718e0e767f3d4585"/><file name="core.css" hash="6e82710d5206b6b7c0f70399cf649449"/><file name="date-picker.css" hash="fa68b668561d477e702318fb5d59636c"/><file name="dd.css" hash="f0e5f55969aeda8f65a01033613181c5"/><file name="debug.css" hash="6ef466c0c857e0c405cac7b8911f0824"/><file name="editor.css" hash="2fdb75e85a247c362285d4f079c0a12f"/><file name="ext-all.css" hash="c5e12af950c3ea3a243d0b9ca0dc4dba"/><file name="form.css" hash="38bd5bd602a83075325696af2c447e65"/><file name="grid.css" hash="c6d110f89542c04e4cbf98de73e97e9b"/><file name="layout.css" hash="89251906d248b3756f0ed354491651a6"/><file name="menu.css" hash="88eb8b3754612496ccf9d386694a39e0"/><file name="panel.css" hash="deaf7ccb5526687fadd67c093da9e604"/><file name="qtips.css" hash="2a6e683a7b23cbdf52177d7141d17435"/><file name="reset-min.css" hash="8fddbb1b7930f2817f2d5d215be98d5f"/><file name="resizable.css" hash="a50b8d1ea8e9dfbdd101a43bc63857c3"/><file name="tabs.css" hash="323d6f11f1550a43a02a617e39242ed5"/><file name="toolbar.css" hash="d09eb7507f57178967d217caeaa8b046"/><file name="tree.css" hash="b0104f954fbe1f04ebf49acffcec74ef"/><file name="ytheme-aero.css" hash="c25b48ba1b913f2ea094065fa916e9da"/><file name="ytheme-galdaka.css" hash="8b1917749205e64bdbcecc893e188b09"/><file name="ytheme-gray.css" hash="c45ba874b89038c9c8d9a79a1c591f26"/><file name="ytheme-magento.css" hash="94c3fc72743ad6d1fe7d8e74d713750e"/><file name="ytheme-vista.css" hash="2092ef97154cf5f6b33893bf5e178e21"/></dir><dir name="images"><dir name="default"><dir name="basic-dialog"><file name="btn-arrow.gif" hash="9e2365ef98c6096f6b5f411ab618bb4e"/><file name="btn-sprite.gif" hash="73a8327c23c12ed9ec42ac8f52b072e0"/><file name="close.gif" hash="2d54069e9355f295dd27027f7f779eb9"/><file name="collapse.gif" hash="63b2687a2dc81537765a7d22f9e480da"/><file name="e-handle.gif" hash="f9357e6c1dfbd00da007cf6705e08225"/><file name="expand.gif" hash="740af52fb7de6ca9fd888184e86a5308"/><file name="hd-sprite.gif" hash="6a54ae98bef53397d52282201852c204"/><file name="progress.gif" hash="baff9a083b93588fa7ff3548844a9e1a"/><file name="progress2.gif" hash="339036f9eb530c1b180c77f9a109ef3e"/><file name="s-handle.gif" hash="36b90844c0b35da23da21aac599957d4"/><file name="se-handle.gif" hash="668b22581100befcf947e806599dc0ce"/></dir><dir name="box"><file name="corners-blue.gif" hash="86fd4c5664e0971bfc11959e8442604c"/><file name="corners.gif" hash="d2d1bc2085b369ce35ffd20c0121676e"/><file name="l-blue.gif" hash="ced9ffbf66ea39e77083a591f8257267"/><file name="l.gif" hash="c4d9dbbdc59ae06b5e9e72a6a865c981"/><file name="r-blue.gif" hash="82dbb522a80e3246f6297719371a9494"/><file name="r.gif" hash="bf1e1d4a45f951ae656968a8c834f04a"/><file name="tb-blue.gif" hash="7c4b19eb682afdc1bde0640d2321fb25"/><file name="tb.gif" hash="dd3f63afe7ba90983ba73dad1c66bf2f"/></dir><dir name="dd"><file name="drop-add.gif" hash="95eb34ac70a1a3c95ef39ab826a89491"/><file name="drop-no.gif" hash="ae536c37391ba78143b5c8283cec8d13"/><file name="drop-yes.gif" hash="f3216326c00890259e84f1726dd1043f"/></dir><dir name="editor"><file name="tb-sprite.gif" hash="8908365d736426795ce46de7e328b508"/></dir><dir name="form"><file name="clear-trigger.gif" hash="97b3e5e9edf27b50d63d48098c2f1eae"/><file name="date-trigger.gif" hash="9245675ed8931df277184b419cf4cdad"/><file name="error-tip-corners.gif" hash="364474276178c7b48b6270056b42b808"/><file name="exclamation.gif" hash="40491021e901fa801dbbc09b6c59d73e"/><file name="search-trigger.gif" hash="559ef372cf27a38678d84e8c0b7237fc"/><file name="text-bg.gif" hash="d5ba54c1f417e6a72cbce8b909078727"/><file name="trigger-tpl.gif" hash="d7be20f0dc38f4f46cd318fe32cf3ce3"/><file name="trigger.gif" hash="45019efdf75528242c5a68742821dc57"/></dir><file name="gradient-bg.gif" hash="e117fca9d088e4cd5bbbcec7b99a8408"/><dir name="grid"><file name="Thumbs.db" hash="c3affff39ba36b80da43a08c34a61391"/><file name="arrow-left-white.gif" hash="b04e859bdcbd21ad1f06b8bfa7881df8"/><file name="arrow-right-white.gif" hash="714eb00f8134dde3a65c83f3f71ad2c4"/><file name="col-move-bottom.gif" hash="9c38bcb5cee1dc9b4ce64ad9ab1386f8"/><file name="col-move-top.gif" hash="c4584202d5172464050f675d396d1c6f"/><file name="dirty.gif" hash="decca3b96e2c37cf6eb04ddb0d9f669b"/><file name="done.gif" hash="365266930a93451414fe51ffc524a196"/><file name="drop-no.gif" hash="b53ca86d60fbcc7a45c8917299218bfd"/><file name="drop-yes.gif" hash="af96f4c3b32a470db2f38abb521b5c97"/><file name="footer-bg.gif" hash="65ed63e44c6149f1127ad3b4be4e0108"/><file name="grid-blue-hd.gif" hash="dd35d5c1202c440c2d1a945b335984d3"/><file name="grid-blue-split.gif" hash="0494ba49974ff2bc1bf81e1d82dfee18"/><file name="grid-hrow.gif" hash="55972a5063d80f35fb6b95a79bb0018a"/><file name="grid-loading.gif" hash="9ac6f737eb9b15272f12b00bfeb3c3c6"/><file name="grid-split.gif" hash="3ef419d4b9421d8e94f673a6238dc4c0"/><file name="grid-vista-hd.gif" hash="675f403e8a9cb5ab4bed725da9fe2023"/><file name="grid3-hd-btn.gif" hash="e3e77072c16a6b27556236961f29c552"/><file name="grid3-hrow-over.gif" hash="a92d8f6c106943995720f2884634670e"/><file name="grid3-hrow.gif" hash="4c58074bb961c8f184522355f1b0eb90"/><file name="grid3-special-col-bg.gif" hash="c9df03a1c107360128da89fa47066405"/><file name="grid3-special-col-sel-bg.gif" hash="a94039f89dec164896ceff1fbdf6dbc5"/><file name="hd-pop.gif" hash="e5f27a2f68cc2d13b11cf41c46d298dc"/><file name="hmenu-asc.gif" hash="048e0bc30f7c39d473dad5dabcbe03f2"/><file name="hmenu-desc.gif" hash="f0a987b34b003b25a7c82624d41f018a"/><file name="hmenu-lock.gif" hash="bcef18e25342c69c37c44dab87086065"/><file name="hmenu-lock.png" hash="2a3b0b441834f443c1086930939efdae"/><file name="hmenu-unlock.gif" hash="8cc8205dafa587ef02d8a86903ae8074"/><file name="hmenu-unlock.png" hash="c1f61df70b98c5498ea81e7e7b9effbb"/><file name="invalid_line.gif" hash="04a88e97b56e8a8ece4a66d49cc78828"/><file name="loading.gif" hash="00ef871b291bc03a497d608a5bd8ec99"/><file name="mso-hd.gif" hash="37fba9c02f0eefe57f655890eef1c4a1"/><file name="nowait.gif" hash="23c91166dbb16ba8655363321bf5a400"/><file name="page-first-disabled.gif" hash="8d3185028c541cbcce67b5909c04824e"/><file name="page-first.gif" hash="16ec00fa770d860b768cf5034ddfca96"/><file name="page-last-disabled.gif" hash="1d123237ceeb5109a1b9274f0cf19d73"/><file name="page-last.gif" hash="ef524dd0b8dfe4eefecffaa1c0bb8edd"/><file name="page-next-disabled.gif" hash="0f4b8681772c91921fa93ede9c755ea0"/><file name="page-next.gif" hash="f6f9d2209dfc99912ffc9848d97646db"/><file name="page-prev-disabled.gif" hash="eefcbed15c8d37a89618b08f7b224297"/><file name="page-prev.gif" hash="80daad880483eed682b22ec70514ecc4"/><file name="pick-button.gif" hash="b431fdf306f1e2f033d0a431996de93f"/><file name="refresh.gif" hash="8dae08d3581dcd9a04ca73877eab4b53"/><file name="row-check-sprite.gif" hash="2d0aa7e501c3e6f97a97faf75e35d3c3"/><file name="row-expand-sprite.gif" hash="be81199d9d4fa69bef47a8f036a5a7d8"/><file name="row-over.gif" hash="f639094bd0560aefabc86e51a825f23d"/><file name="row-sel.gif" hash="ca87d6b950386edd5e17c985769d9101"/><file name="sort_asc.gif" hash="cc186187e31b0c39abbb7d2394916292"/><file name="sort_desc.gif" hash="fcfe91243fac2e5f24d05bb44f78ded4"/><file name="wait.gif" hash="b0cd5a5dc070c705ebf8814a909802c3"/></dir><dir name="layout"><file name="collapse.gif" hash="dfcec0803d488a783916c750fd83a897"/><file name="expand.gif" hash="c9c9b0ea5311c3dc016c69dc234912bc"/><file name="gradient-bg.gif" hash="e117fca9d088e4cd5bbbcec7b99a8408"/><file name="ns-collapse.gif" hash="efa9fbd7a1f3f0f1f22360391e16126f"/><file name="ns-expand.gif" hash="da1f9d40c091d3b6dc7a8dee4fc02ac6"/><file name="panel-close.gif" hash="b185da1837344529bfb684a96d8371b5"/><file name="panel-title-bg.gif" hash="b66384c309a397963389a76b07e9ecd4"/><file name="panel-title-light-bg.gif" hash="688d3a263442db125da170e5d3aebf70"/><file name="stick.gif" hash="be9e67ae0b61b01cfd15928ca7a3da51"/><file name="stuck.gif" hash="745e0cacb51250ea0216efc4a1cb50cb"/><file name="tab-close-on.gif" hash="0ae2c978e85391a69f0dce8da18d8b23"/><file name="tab-close.gif" hash="f92107cc6b4cb78af084648a628e01d2"/></dir><dir name="menu"><file name="checked.gif" hash="692bc97badf50c05495f6109143b4b11"/><file name="group-checked.gif" hash="f7973443d91e5e074013f1b07ee79479"/><file name="menu-parent.gif" hash="d303ad7e3ced891736e80f77e1d4e51d"/><file name="menu.gif" hash="5d34732294bbe06a862961dd02bcc962"/><file name="unchecked.gif" hash="9b90ed7c9e8f0892ce09f3b35b19db53"/></dir><dir name="panel"><file name="corners-sprite.gif" hash="06daef2335218cdfd900ce8bf7a68738"/><file name="left-right.gif" hash="49344fefef7c6f866f910b9067f0990f"/><file name="tool-sprite-tpl.gif" hash="e0449768cd5dce80b18fac904818ab33"/><file name="tool-sprites.gif" hash="31ccd74ac8dab4b5669887310a2341df"/><file name="top-bottom.gif" hash="d9a86e8466a31bd1cb87aae2cf55faf2"/><file name="white-corners-sprite.gif" hash="de8b3036676d19b9635f319a8a4aad36"/><file name="white-left-right.gif" hash="77a6389c6737ad507ca5330ad8816524"/><file name="white-top-bottom.gif" hash="f865d7237bff3c45fd4a8c448f97d236"/></dir><dir name="qtip"><file name="bg.gif" hash="49c0a530cc16357bb39d51c13065a88f"/><file name="close.gif" hash="0379d036250096cae2e42b427b3df2e7"/><file name="tip-sprite.gif" hash="11637a20b1f3f2331bf0627146c2f433"/></dir><file name="s.gif" hash="fc94fb0c3ed8a8f909dbc7630a0987ff"/><file name="shadow-c.png" hash="3abbfce345687daada53445adf6fddc7"/><file name="shadow-lr.png" hash="986270d8ab4330fa7499dc33ed135598"/><file name="shadow.png" hash="860bf4f690d2ea2aba7b11500925da62"/><dir name="shared"><file name="calendar.gif" hash="81296cff1f97f5365524f2b9dcf626da"/><file name="glass-bg.gif" hash="bc2cd5c5ac9b3874d956c892d23f2119"/><file name="left-btn.gif" hash="6bf30c6cf0b5d70436c3e463b5532b35"/><file name="right-btn.gif" hash="e7ad3a7f4814791cecf1b90e77e9e139"/><file name="warning.gif" hash="448dc934a7f0dd6092b51f88a1e47b2d"/></dir><dir name="sizer"><file name="e-handle-dark.gif" hash="b86289f41d7ad1a7401dd2b2a9b3c3d8"/><file name="e-handle.gif" hash="510edc95ebaa36306916c50ca10596f7"/><file name="ne-handle-dark.gif" hash="115f71b851c7f0b5f354caa7b8dfff15"/><file name="ne-handle.gif" hash="8e268b962dc909d275997b572ff17a72"/><file name="nw-handle-dark.gif" hash="4a361e6920b2e34a39fd425a515c83b9"/><file name="nw-handle.gif" hash="1120600505249c38c3d1cc2ab120cd13"/><file name="s-handle-dark.gif" hash="4a6bf15d308a4ae580dd03cbd431a95c"/><file name="s-handle.gif" hash="5e3338cb09e9df7f52383d6b1423fc86"/><file name="se-handle-dark.gif" hash="f3d8d8aac23e3e9633072e2366cda847"/><file name="se-handle.gif" hash="71edc3f63f79f447d2c81ee09e1fbbc3"/><file name="square.gif" hash="4431ea1954bfd2a9cea0931f07fc7ffa"/><file name="sw-handle-dark.gif" hash="44b2400d873cf8a23d84424827cde44d"/><file name="sw-handle.gif" hash="c3e0befc4208a51180344765fd7deeda"/></dir><dir name="tabs"><file name="tab-btm-inactive-left-bg.gif" hash="4f141a6abf25d3c9409b6c381333c138"/><file name="tab-btm-inactive-right-bg.gif" hash="eb2423d3b9dd072976ce955ab0c683d6"/><file name="tab-btm-left-bg.gif" hash="a36eb9382ed8b858eff2c5d4e5d7011a"/><file name="tab-btm-right-bg.gif" hash="9e4245776f0f7b6b6c7ddbf40a43103a"/><file name="tab-sprite.gif" hash="6a7d481bf5b74acfbfa0b01a35bd6620"/></dir><dir name="toolbar"><file name="btn-arrow-light.gif" hash="fa49b39a0fd88ef26264da44a2b4edea"/><file name="btn-arrow.gif" hash="12bda29a4c8016cfa047e852c4353f59"/><file name="btn-over-bg.gif" hash="faddf9b24cefa721326ba3f87f3ef31f"/><file name="gray-bg.gif" hash="cf2d9408f320e696e607d8472afa7ff0"/><file name="tb-bg.gif" hash="5309337fd7a22cab9d9467fd9eaa0a0c"/><file name="tb-btn-sprite.gif" hash="3aed28dd646d22e215c8a6a3e983322f"/></dir><dir name="tree"><file name="drop-add.gif" hash="95eb34ac70a1a3c95ef39ab826a89491"/><file name="drop-between.gif" hash="edb544a0de58547d4a39c526e06e3c82"/><file name="drop-no.gif" hash="67f83ea04a2eb1c50614a96faf625f25"/><file name="drop-over.gif" hash="d6b303cfa3de8784057d9d7e66cdaa86"/><file name="drop-under.gif" hash="55e5dbc9451cfa91423832260b0753aa"/><file name="drop-yes.gif" hash="f3216326c00890259e84f1726dd1043f"/><file name="elbow-end-minus-nl.gif" hash="5e5bffba157eceee7989db95b919e4d5"/><file name="elbow-end-minus.gif" hash="a469f6a4394d797c2efeffc70409f6db"/><file name="elbow-end-plus-nl.gif" hash="f0f50c0dd3ee6dd4b11c1f245b36eb01"/><file name="elbow-end-plus.gif" hash="ec1482391363612d9e5f8c7087fddaba"/><file name="elbow-end.gif" hash="345551384aa325189ba28a1c20f3405e"/><file name="elbow-line.gif" hash="90e478158df476dc989a60daaafc87e6"/><file name="elbow-minus-nl.gif" hash="5e5bffba157eceee7989db95b919e4d5"/><file name="elbow-minus.gif" hash="71bb1bd44b1274c60d30dba1de472ed7"/><file name="elbow-plus-nl.gif" hash="f0f50c0dd3ee6dd4b11c1f245b36eb01"/><file name="elbow-plus.gif" hash="945572d06a74b5f952251a86c595f2da"/><file name="elbow.gif" hash="27679f3b1222ba95d9925885d7d82d02"/><file name="folder-open.gif" hash="c569141d6ae7c61d838ed8af26aa9380"/><file name="folder.gif" hash="b7209740bb4a825a06beb8698d92c2b1"/><file name="leaf.gif" hash="23757d6e353f343e3c7edfe28428f198"/><file name="loading.gif" hash="00ef871b291bc03a497d608a5bd8ec99"/><file name="s.gif" hash="fc94fb0c3ed8a8f909dbc7630a0987ff"/></dir><dir name="window"><file name="corners-sprite.gif" hash="b485d6e69678822a0fb77cc312487874"/><file name="left-right.gif" hash="3fe626d6ca2f71d36fc62c32cb1cc52a"/><file name="top-bottom.gif" hash="8a227016c401438e602c2f770a611d5b"/></dir></dir><dir name="magento"><dir name="basic-dialog"><file name="collapse-on.gif" hash="b60dfdc0d00cfb30a8a622e0c22eed84"/><file name="collapse.gif" hash="8525b9d2e93d31e0b071b1f9bf9550e5"/><file name="expand-on.gif" hash="0dfb4ac6d626cdcaa931c14dbb45848e"/><file name="expand.gif" hash="0eb5c03da8b8415e0568784c959e536a"/><file name="hd-sprite.gif" hash="035bf2296afd70af7020cf06b60bf3f6"/><file name="ns-collapse-on.gif" hash="88ed8b7578c803f68d9f1eb171454e00"/><file name="ns-collapse.gif" hash="44b91376c040f91672aaa98c1fcc062b"/><file name="ns-expand-on.gif" hash="587c2ce90066280e5e6cd731bb9d346c"/><file name="ns-expand.gif" hash="57b479b168f8a54200bd1770b5591630"/><file name="panel_close.gif" hash="686c6dfcf341de25487ab4d8ea5954ce"/><file name="pop_close.gif" hash="dd3605531f9959901eff6f089f084bdc"/><file name="pop_collapse.gif" hash="2b8007242ae1c9ae9f26c60a878a63f7"/></dir><dir name="grid"><file name="grid-body-bg.gif" hash="b5fe585c01f57b2171a2b723abcc4a38"/><file name="grid-split.gif" hash="32e210451e8dc4295b53cf7ca13bb4a6"/></dir><dir name="layout"><file name="checkered-bg.gif" hash="f0a0cd29a6120377c289fd39e2ee7e80"/><file name="icon-catalog.gif" hash="435ff2300ddefb9f8a4bad8ee806fb1a"/><file name="icon-category.gif" hash="ce2a146851bb5ec1e41670b68183b56a"/><file name="icon-my-tasks.gif" hash="0ecb888b160701845e25a7140d038af0"/><file name="icon-product.gif" hash="a0707878c5221052209e5ae6a4de0bd2"/></dir><file name="loading_bg.gif" hash="e202ef7e03d0ef3e9beac7480dae65bf"/><dir name="tabs"><file name="tab-sprite.gif" hash="049fb2f4186b6dc9de747ad96456b1ab"/></dir><dir name="toolbar"><file name="btn-arrow.gif" hash="938cffb6de5cc8b1febfd1851fd983c2"/><file name="header_bg.gif" hash="3696842a32740fa159484cabc3340d13"/><file name="toolbar-bg.gif" hash="8d1b465c2a75963407b536d9081f649f"/></dir><dir name="tree"><file name="elbow-end-minus-nl.gif" hash="6dc08c43109cc6a365bd0270f05e2f1c"/><file name="elbow-end-minus.gif" hash="3dbdb88a9297fe5631e832f046b0350b"/><file name="elbow-end-plus-nl.gif" hash="6dc08c43109cc6a365bd0270f05e2f1c"/><file name="elbow-end-plus.gif" hash="5470e5712a9742ba666c26cb429baaeb"/><file name="elbow-end.gif" hash="63fe879440e2784e0cc0d316ce017745"/><file name="elbow-line.gif" hash="b316a39455304e20e01dbc437f57fd32"/><file name="elbow-minus-nl.gif" hash="0e3129bff70475c8f7f297e0e59d1608"/><file name="elbow-minus.gif" hash="e7b18ff6800e65c6e171bbb2a911762e"/><file name="elbow-plus-nl.gif" hash="78a8f737941fa658f1e770258a3791cd"/><file name="elbow-plus.gif" hash="b02cb264df55aef2105b1b245d075e56"/><file name="elbow.gif" hash="b6bd0e0237e3cd413fa2dac27701c724"/><file name="folder-open.gif" hash="e3cd196406d4857dc0c926807f16c409"/><file name="folder.gif" hash="03eb26c42137ac792609822862ef4d0f"/><file name="leaf.gif" hash="e3cd196406d4857dc0c926807f16c409"/><file name="s.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/></dir></dir></dir></dir></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
-</package>
diff --git a/var/package/Lib_Js_Mage-1.5.0.0.xml b/var/package/Lib_Js_Mage-1.5.0.0.xml
deleted file mode 100644
index 9f73955f9a..0000000000
--- a/var/package/Lib_Js_Mage-1.5.0.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Lib_Js_Mage</name>
-    <version>1.5.0.0</version>
-    <stability>stable</stability>
-    <license>Mixed</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Javascript Libraries for Magento</summary>
-    <description>Javascript Libraries for Magento</description>
-    <notes>1.5.0.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:01:00</time>
-    <contents><target name="mageweb"><dir name="js"><dir name="lib"><file name="FABridge.js" hash="64244d8d58abd42bd71f0ee3309767ad"/><file name="boxover.js" hash="a5ade77452e8d5066cb84dcac3d34ed5"/><file name="ccard.js" hash="d3e849be0977d53de4af933b40293ff6"/><file name="dropdown.js" hash="7e75949a7deb9d9f6c3da02eed2f83af"/><file name="ds-sleight.js" hash="85af457d444865d1587bfe4875bd4fc6"/><file name="flex.js" hash="4338368f644170d8adc5ba5a96ebf476"/></dir><dir name="mage"><dir name="adminhtml"><file name="accordion.js" hash="7296cc8789e73067a9b30b905bca7359"/><file name="browser.js" hash="36d93056f8c6df9f5eeaaa7df8288d0c"/><file name="events.js" hash="c35486603231f692c631329946170c74"/><file name="flexuploader.js" hash="65f078729646874321674c4171889f6a"/><file name="form.js" hash="d04b65a3c7daf8feba0695907ee203da"/><file name="giftmessage.js" hash="f3573a7e05c5c6e19be46228079fbe64"/><dir name="giftoptions"><file name="tooltip.js" hash="4ab8acda6cbc4bdeb17f0bb24ff62684"/></dir><file name="grid.js" hash="691a2e72846ccc4b0f5c6786342f7849"/><file name="hash.js" hash="576d4b54646d5de65c1444346dd30a5b"/><file name="image.js" hash="b8042143be2912da69c93d37f31108f6"/><file name="loader.js" hash="2343c13309255407fa596e9fab984f44"/><file name="magento-all.js" hash="e5162e47deef66e76922a2643a1b1e1c"/><dir name="product"><dir name="composite"><file name="configure.js" hash="ff04619142ed83680beb8e0dd1211709"/></dir></dir><file name="product.js" hash="671911c226fa52708fb0b58604b22788"/><file name="rules.js" hash="8cc933d404089ed67fdd0e0a593db336"/><file name="sales.js" hash="d80c40eeef3ca62eb4243443fe41705e"/><file name="scrollbar.js" hash="2181ac51ced8ec5b6043f1cfc1a478d4"/><file name="tabs.js" hash="bd1249b54e91b5b9a75621309220bcb4"/><file name="tools.js" hash="65dabc141c68574b4f9f4dc65d01929c"/><file name="uploader.js" hash="500b77e8d493c895df7510a82c435856"/><file name="variables.js" hash="33e74003e060c42d9374509ea90f42b6"/><dir name="wysiwyg"><dir name="tiny_mce"><dir name="plugins"><dir name="magentovariable"><file name="editor_plugin.js" hash="46893df8fcf76dc5b65428d7c764122f"/><dir name="img"><file name="icon.gif" hash="682b29a0e734f952cb2edabede6a25d1"/></dir></dir><dir name="magentowidget"><file name="editor_plugin.js" hash="162964c92b4e31f3eda7b16e032a4376"/><dir name="img"><file name="icon.gif" hash="532c141286373f098f1f4362e001c7f8"/></dir></dir></dir><file name="setup.js" hash="75cfbe5225b18f85dbd4e1e7493ac50f"/><dir name="themes"><dir name="advanced"><dir name="skins"><dir name="default"><file name="content.css" hash="f2eac3ad7976113d4ef68d747a6dd2e7"/><file name="dialog.css" hash="77280481a7b15c6c3617c54de0e2031d"/></dir></dir></dir></dir></dir><file name="widget.js" hash="ad7489f07552ff43d60f6a637ec58cfb"/></dir></dir><file name="centinel.js" hash="cde1199ee714ef7fbb48c237e8a0bab1"/><file name="cookies.js" hash="991b0c91535dde8b39e4b46e6dae64b3"/><file name="directpost.js" hash="5d00d0868db9e7a99838ea955ebe5d72"/><file name="translate.js" hash="a8b3c87408503241c12c3104c2554727"/><file name="translate_inline.css" hash="2cf92754fff072b14bdbfc02629abb5a"/><file name="translate_inline.js" hash="6b9eaf3e45fd9d75d2c27245bf080c1d"/></dir><dir name="varien"><file name="accordion.js" hash="ad2054ae8011cce9368f9c01b626c3a8"/><file name="configurable.js" hash="c6b3f0eb04f5529b97d89da284a63174"/><file name="form.js" hash="ecf32ddbbab01812bacc13b272ef6b38"/><file name="iehover-fix.js" hash="5f9e437d1bcf6ff1fac0214945a7c7b9"/><file name="js.js" hash="9145e503e8a253ca5fdd4ac159d901c2"/><file name="menu.js" hash="bcf864355fbb80e21968b83af4fffe64"/><file name="payment.js" hash="8b042b1837d083efc5af40b7835929f6"/><file name="product.js" hash="90c1d2a058b27b3ac7332f99b9188867"/><file name="telephone.js" hash="afc638565107efb4b4944a753b399cfd"/><file name="weee.js" hash="fe9505fd62c1db4a08003bc2416fda52"/></dir><file name="blank.html" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="index.php" hash="9a76023de59c1958cac0473ef31efa26"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><dir name="flash"><file name="AC_RunActiveContent.js" hash="3e038cea960c1b650442b85cea237053"/></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Lib_Js_Prototype</name><channel>community</channel><min>1.6.0.3.4</min><max>1.6.1</max></package></required></dependencies>
-</package>
diff --git a/var/package/Lib_Js_Prototype-1.6.0.3.3.xml b/var/package/Lib_Js_Prototype-1.6.0.3.3.xml
deleted file mode 100644
index b5b9dd6582..0000000000
--- a/var/package/Lib_Js_Prototype-1.6.0.3.3.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Lib_Js_Prototype</name>
-    <version>1.6.0.3.3</version>
-    <stability>alpha</stability>
-    <license>Mixed</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Prototype and Scriptaculous Javascript Libraries for Magento</summary>
-    <description>Prototype and Scriptaculous Javascript Libraries for Magento</description>
-    <notes>1.6.0.3.3</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2010-12-17</date>
-    <time>2010-12-17</time>
-    <contents><target name="mageweb"><dir name="js"><dir name="prototype"><file name="debug.js" hash="d5990eabf728ade1f34496737455c8ff"/><file name="deprecation.js" hash="4dfe41a2d0ef43c8fe7726bd2b80b18d"/><file name="effects.js" hash="91e1b7d8c6043dff4eadbe054a90e3a7"/><file name="extended_debug.js" hash="cc706bc76bb1c5a2610fc296cd85e053"/><file name="prototype.js" hash="d23187d61f796d39487acbe34af031bc"/><file name="tooltip.js" hash="8509b04b1594b7e6382d7cfdf4ee1236"/><file name="tooltip_manager.js" hash="6b9759cbad296fda3c18d7669d6b5af0"/><file name="validation.js" hash="7d7c62bea91711414bff97046f56e3e9"/><file name="window.js" hash="1c6a9c7208335dc5104c2243a6d38ae6"/><file name="window_effects.js" hash="3c0b47a0f3cd41753a3992d01c118c3d"/><file name="window_ext.js" hash="5ab45fe5f734927890c95b9d5547f47f"/><file name="window_readme.txt" hash="97306d2a8c4be2ec65f66d2ec233289c"/><dir name="windows"><file name="MIT-LICENSE" hash="a839f717f1675b571481268a4e4a4ee2"/><file name="README" hash="75b8b2e714cbcb48337540a451655967"/><dir name="themes"><dir name="alert"><file name="bottom.gif" hash="e859e3bc00c4f10360fa81a659aa673f"/><file name="bottom_left.gif" hash="53585b1a0351d599e76a85ccc26f7980"/><file name="bottom_right.gif" hash="8170abe3fec71fd17612869a2f036cd6"/><file name="left.gif" hash="4f235c4e6afb0d386d220638c49e4545"/><file name="overlay.png" hash="f4ddcee6f819975bc9c5643b570de6dc"/><file name="progress.gif" hash="86b1ac6d1c485d54efa3a53643e91ceb"/><file name="right.gif" hash="838ade41815529e7a63f99c93b3a01f7"/><file name="top.gif" hash="8702ca9b81c19f6220ce81c4ea215878"/><file name="top_left.gif" hash="a8c097bcb67bddf640c2bd9161b79476"/><file name="top_right.gif" hash="05ef4e1a417a5a2c81fc816406a4842a"/></dir><file name="alert.css" hash="27df86baae5a6fa2e3556bdf1b85ccc6"/><file name="alert_lite.css" hash="fbeaff8f185cd3b302f1a8db5efa0110"/><dir name="alphacube"><file name="bottom-left-c.gif" hash="434cdfc5298f33efb108264cf3370e1c"/><file name="bottom-middle.gif" hash="3f882dd32d57a29a785f448bbba5ed26"/><file name="bottom-right-c.gif" hash="4c37ad7b94fc901a1cfaf54a1742d5fd"/><file name="button-close-focus.gif" hash="99c44a6df2733b58083af7a4d9522116"/><file name="button-max-focus.gif" hash="408cd33fa89269b8395bf10afe69d456"/><file name="button-min-focus.gif" hash="ae06210658bad8bcc88dea377c4dc908"/><file name="frame-left.gif" hash="1bb1207b43425d214d4dc0da108f5449"/><file name="frame-right.gif" hash="8b9c36079881aa15c27a137666c56a38"/><file name="left-top.gif" hash="1ea936a090b4dfe8160fcb3a90ddb145"/><file name="right-top.gif" hash="e1b641feab640cb4207fa52160715e32"/><file name="top-middle.gif" hash="7f94c1018d023832c7c9e1fa468a9555"/></dir><file name="alphacube.css" hash="27c968911eaef53df158c55083ef0c84"/><file name="behavior.htc" hash="5588dff36ad5595f8353730e853044e5"/><dir name="darkX"><file name="button-close-focused.png" hash="5090b529a86a79679e0a26ccb0e1b0c6"/><file name="button-maximize-focused.png" hash="0f84bfcc9626d2cb1826291268b29f20"/><file name="button-minimize-focused.png" hash="630cd8cdd7124d412c6253e5c7cfc32a"/><file name="frame-bottom-left-focused.png" hash="8a34a3be2f349315dfd287ec15148332"/><file name="frame-bottom-mid-focused.png" hash="f1dbacdb64a19e00a485d426126f26db"/><file name="frame-bottom-right-focused.png" hash="17acb7874856dc68c3c017238d42054a"/><file name="frame-left-focused.png" hash="f30ab13888b2e48d0637991164a8f748"/><file name="frame-right-focused.png" hash="1115115c62507971b2f5eed3c2c5c2d0"/><file name="titlebar-left-focused.png" hash="491130dedbdbb3b2682f37424347b14c"/><file name="titlebar-mid-focused.png" hash="ae46975fc8a5e5a9f73f810d0c88809a"/><file name="titlebar-right-focused.png" hash="9560eb10dee94985f3ebe935833e2ae4"/></dir><file name="darkX.css" hash="16a964cfe57a2c979ad3d97831673b79"/><file name="debug.css" hash="63ee9aa7b7d80e0bb5e311407746ccd3"/><dir name="default"><file name="bottom_left.gif" hash="fb99ffa815a8648f95f42698fe5dfaa1"/><file name="bottom_mid.gif" hash="49b9ca7025562ea7f070a9111282364b"/><file name="bottom_right.gif" hash="e46768f632765cd86c5fe5d0166dcf2c"/><file name="bottom_right_resize.gif" hash="1b35a4ec3b734dfe37e31ba87bcc7d99"/><file name="center_left.gif" hash="bd567580b4ee16a7a2734057cfbbe219"/><file name="center_right.gif" hash="eef184d5d89d1710313581a2ccf408e8"/><file name="clear.gif" hash="7af1206eeb0e7834a75e69d70676060d"/><file name="close.gif" hash="8a08f243c37a8e25a88d4ac135b2f07d"/><file name="inspect.gif" hash="aa2a0961067aad5c54b8634919af863b"/><file name="maximize.gif" hash="e73cd71c4979ebeadeb9e27d40a9e8fb"/><file name="minimize.gif" hash="2d2f4b1bd0506f342425f80ab76c49a3"/><file name="overlay.png" hash="536d40e87cda0c7ae7b11f1721aa52d0"/><file name="resize.gif" hash="320f534b5d444b39701e0b679529e779"/><file name="sizer.gif" hash="1b35a4ec3b734dfe37e31ba87bcc7d99"/><file name="top_left.gif" hash="9c5e5920bfc189a45cc618099af93aa8"/><file name="top_mid.gif" hash="a12ff2b944025ad2d127d033dae5e9e1"/><file name="top_right.gif" hash="0cf1ec5b93f8ac8fcce0e2f72cf7f45e"/></dir><file name="default.css" hash="16014098f441d12d06c088135e2fde28"/><dir name="iefix"><file name="blank.gif" hash="56398e76be6355ad5999b262208a17c9"/><file name="iepngfix.css" hash="da3154c9a817850376f73a7976bfcb13"/><file name="iepngfix.htc" hash="b50c4e352a64254c5ceb6c63bcd0b176"/></dir><dir name="lighting"><file name="background_buttons.gif" hash="e66e67aaaf08a7b24f3cd1ba22584b42"/><file name="bottom-left-blue.png" hash="7c9e91d421945141315fc105d464a99f"/><file name="bottom-left-darkblue.png" hash="e88c2380acf403ee28597c6045988cc6"/><file name="bottom-left-green.png" hash="ee25ce8a12229b009fbfd91f7ba51e26"/><file name="bottom-left-grey.png" hash="5fdb3eae397ac7279aa5a7fdaad3dcc2"/><file name="bottom-middle-blue.png" hash="e93cc9d31d88f45c047a98a66be04354"/><file name="bottom-middle-darkblue.png" hash="763c88c424e0900e675042d3f0958bd4"/><file name="bottom-middle-green.png" hash="77e0a22afd2c55a83b5c7fa98a12ef25"/><file name="bottom-middle-grey.png" hash="3a2ebdeff74e2ff63c4471575568dd01"/><file name="bottom-right-blue.png" hash="0bc11a61047e8716451a283ebff897e5"/><file name="bottom-right-darkblue.png" hash="88e33ea702a304ae237edd57bc8447d6"/><file name="bottom-right-green.png" hash="7bce162df013eba43a659ae6e780ae4b"/><file name="bottom-right-grey.png" hash="86eb476492d911aac5688c9747fe7a1d"/><file name="button-close-blue.png" hash="42ae1a35caf8a9a275d6e748c27769fb"/><file name="button-close-darkblue.png" hash="50dbcd898dc519c1e6ac0d3a478978cd"/><file name="button-close-green.png" hash="b4273572fa91cba909a0a3e15b994d19"/><file name="button-close-grey.png" hash="124964b634ba67f2bb6dd08cf8cafd5a"/><file name="button-maximize-blue.png" hash="85b79237d85b09c205e09166dd8f4af0"/><file name="button-maximize-darkblue.png" hash="108d10619214e3365820aa4ab008aed5"/><file name="button-maximize-green.png" hash="90f5527705e4fd81997564e81c6ac2a3"/><file name="button-maximize-grey.png" hash="c46a8c014bd14be167f4c6a2f2dd52ed"/><file name="button-minimize-blue.png" hash="1fd738b99877a4dfa5656491cc3d8e6b"/><file name="button-minimize-darkblue.png" hash="b6d9da1cdf51ab54682fa75a6df2c40d"/><file name="button-minimize-green.png" hash="9e7d26298a0a49ffee3fbab6ea838e01"/><file name="button-minimize-grey.png" hash="0432701c2425cb3a5143d8a04bda0d87"/><file name="left-blue.png" hash="0a6acf0a863c04845a93b681769527cd"/><file name="left-darkblue.png" hash="44cdce8a75de4425d7eb7763092cc38d"/><file name="left-green.png" hash="d83116c49d62dc46bff0b7b4200b4ecf"/><file name="left-grey.png" hash="f3486d3293ae98b5edb8889c4b4082ef"/><file name="pngbehavior.htc" hash="b94c44e30423fd18a8b82bda5a139db3"/><file name="right-blue.png" hash="2c9b6b80d4a6b190b8e38a1c101e828c"/><file name="right-darkblue.png" hash="9b3267c5d36bb3f4588167cc3e78e569"/><file name="right-green.png" hash="4436968c2adbe6ed7c475c225631bc7c"/><file name="right-grey.png" hash="36b3de47bcbbd6b53e2f6e06843ee6e8"/><file name="spinner.gif" hash="c7b3cbb3ec8249a7121b722cdd76b870"/><file name="top-left-blue.png" hash="a5cb9eaa82f67df223d6784a52b26f1f"/><file name="top-left-darkblue.png" hash="e4a3af23d2cae7909331eb1995963c82"/><file name="top-left-green.png" hash="eb4cb604177c342998023d3dcd3aa5b0"/><file name="top-left-grey.png" hash="9f6f39abc4ae9539a0f54567a4a5d4f8"/><file name="top-middle-blue.png" hash="6d01df8637385bbe592b8df369294c8d"/><file name="top-middle-darkblue.png" hash="2c91ea6462e72a29cd07300d4102b88a"/><file name="top-middle-green.png" hash="e0f56311091bfb370fc6783fc7e71068"/><file name="top-middle-grey.png" hash="8c02881b730d602589fe9ed4bcaeb689"/><file name="top-right-blue.png" hash="4afefb06dc63c864211724a6348f25ad"/><file name="top-right-darkblue.png" hash="d8a9031987f648f170af67023179618d"/><file name="top-right-green.png" hash="b38813f9200440051273bdd622f5e545"/><file name="top-right-grey.png" hash="d7f7332ddf8686fb9810e4170767bf52"/></dir><file name="lighting.css" hash="d13de730c8ee7ef04167d361bdf8eebd"/><file name="mac_os_x.css" hash="65204ef34c1eeff0be29c53b0614076a"/><file name="mac_os_x_dialog.css" hash="0b7cd9d6a9e8f940f50bc4a080f54b1b"/><dir name="magento"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="content_bg.gif" hash="21278ea0da2d4256f4ced96b6080ba2e"/><file name="top_bg.gif" hash="26f28090de87d64f9b01bf624f89bfe2"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="magento.css" hash="a0b153cee7655dad31ee2923657cc08a"/><dir name="nuncio"><file name="bottom_left.png" hash="d9be5c7b432a342c6da5ef9b10148267"/><file name="bottom_mid.png" hash="facee2e7ee7c572a8f412750b0ce5387"/><file name="bottom_right.png" hash="6f3c124a066a11ff225897112de8e9d7"/><file name="center_left.png" hash="a11bee83f99addccc0d5eff3d2e82b8f"/><file name="center_right.png" hash="bf6b023ad1751d5f60f9820eea72ac28"/><file name="close.png" hash="46744062a7b54416c8767f8e0ccf1c41"/><file name="minimize.png" hash="bc911a3e90fc0640e0899856759a5e01"/><file name="overlay.png" hash="5ccd88855e923eb8a1bd9da1dec9d7fe"/><file name="top_left.png" hash="d3105aacc2c69954df11af953875a12e"/><file name="top_mid.png" hash="cb679a8c77e9b7485b5f0eca547eb103"/><file name="top_right.png" hash="e65d6fc6bf53891c487e414db16f1038"/></dir><file name="nuncio.css" hash="e30e31b94d96b0b27c80ad6d943d7010"/><dir name="spread"><file name="bottom-left-c.gif" hash="84641d08576f68a11f717103365dfb83"/><file name="bottom-middle.gif" hash="20ab265c67355c5b72cdcdc8739af555"/><file name="bottom-right-c.gif" hash="cb27b72623e997badc599e76024a6e44"/><file name="button-close-focus.gif" hash="99c44a6df2733b58083af7a4d9522116"/><file name="button-max-focus.gif" hash="408cd33fa89269b8395bf10afe69d456"/><file name="button-min-focus.gif" hash="ae06210658bad8bcc88dea377c4dc908"/><file name="frame-left.gif" hash="63dc99b0c4ba0518688f7eca1f1628ca"/><file name="frame-right.gif" hash="a03585eec830f37898c7041d557dafc5"/><file name="left-top.gif" hash="7c78b8b59976d19191acf940cbfc04fb"/><file name="right-top.gif" hash="597530287fe1dc491278f855749f7e01"/><file name="top-middle.gif" hash="fa6fd6b90945c47f8d1718d9139d0a75"/><file name=".gif" hash="9dd39829e7cfdd06f3317a931bdc177e"/></dir><file name="spread.css" hash="a804413d7f1f9550c134477f6f9219ee"/></dir></dir></dir><dir name="scriptaculous"><file name="builder.js" hash="1174f6fc34ca5d54ba10b0c719386e7c"/><file name="controls.js" hash="8c414e1787c0ac9f10b16b252361c8b2"/><file name="dragdrop.js" hash="c824212f4d19277be0fd11a87a9cd0fd"/><file name="effects.js" hash="d795089f95a22306cca9b337c439c65a"/><file name="scriptaculous.js" hash="d59eba4e0b14b672208b0862ae1c2196"/><file name="slider.js" hash="6043f96a71d2685fecd02e2ab99e84d9"/><file name="sound.js" hash="0f0fab23fa2cb1bc7717fd2bdf45402e"/><file name="unittest.js" hash="99969698b22272f77bdf4c64586862b3"/></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
-</package>
diff --git a/var/package/Lib_Js_Prototype-1.6.0.3.4.xml b/var/package/Lib_Js_Prototype-1.6.0.3.4.xml
deleted file mode 100644
index 0fafeaa648..0000000000
--- a/var/package/Lib_Js_Prototype-1.6.0.3.4.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Lib_Js_Prototype</name>
-    <version>1.6.0.3.4</version>
-    <stability>stable</stability>
-    <license>Mixed</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Prototype and Scriptaculous Javascript Libraries for Magento</summary>
-    <description>Prototype and Scriptaculous Javascript Libraries for Magento</description>
-    <notes>1.6.0.3.4</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:01:01</time>
-    <contents><target name="mageweb"><dir name="js"><dir name="prototype"><file name="debug.js" hash="d5990eabf728ade1f34496737455c8ff"/><file name="deprecation.js" hash="4dfe41a2d0ef43c8fe7726bd2b80b18d"/><file name="effects.js" hash="91e1b7d8c6043dff4eadbe054a90e3a7"/><file name="extended_debug.js" hash="cc706bc76bb1c5a2610fc296cd85e053"/><file name="prototype.js" hash="d23187d61f796d39487acbe34af031bc"/><file name="tooltip.js" hash="8509b04b1594b7e6382d7cfdf4ee1236"/><file name="tooltip_manager.js" hash="6b9759cbad296fda3c18d7669d6b5af0"/><file name="validation.js" hash="7d7c62bea91711414bff97046f56e3e9"/><file name="window.js" hash="1c6a9c7208335dc5104c2243a6d38ae6"/><file name="window_effects.js" hash="3c0b47a0f3cd41753a3992d01c118c3d"/><file name="window_ext.js" hash="5ab45fe5f734927890c95b9d5547f47f"/><file name="window_readme.txt" hash="97306d2a8c4be2ec65f66d2ec233289c"/><dir name="windows"><file name="MIT-LICENSE" hash="a839f717f1675b571481268a4e4a4ee2"/><file name="README" hash="75b8b2e714cbcb48337540a451655967"/><dir name="themes"><dir name="alert"><file name="bottom.gif" hash="e859e3bc00c4f10360fa81a659aa673f"/><file name="bottom_left.gif" hash="53585b1a0351d599e76a85ccc26f7980"/><file name="bottom_right.gif" hash="8170abe3fec71fd17612869a2f036cd6"/><file name="left.gif" hash="4f235c4e6afb0d386d220638c49e4545"/><file name="overlay.png" hash="f4ddcee6f819975bc9c5643b570de6dc"/><file name="progress.gif" hash="86b1ac6d1c485d54efa3a53643e91ceb"/><file name="right.gif" hash="838ade41815529e7a63f99c93b3a01f7"/><file name="top.gif" hash="8702ca9b81c19f6220ce81c4ea215878"/><file name="top_left.gif" hash="a8c097bcb67bddf640c2bd9161b79476"/><file name="top_right.gif" hash="05ef4e1a417a5a2c81fc816406a4842a"/></dir><file name="alert.css" hash="27df86baae5a6fa2e3556bdf1b85ccc6"/><file name="alert_lite.css" hash="fbeaff8f185cd3b302f1a8db5efa0110"/><dir name="alphacube"><file name="bottom-left-c.gif" hash="434cdfc5298f33efb108264cf3370e1c"/><file name="bottom-middle.gif" hash="3f882dd32d57a29a785f448bbba5ed26"/><file name="bottom-right-c.gif" hash="4c37ad7b94fc901a1cfaf54a1742d5fd"/><file name="button-close-focus.gif" hash="99c44a6df2733b58083af7a4d9522116"/><file name="button-max-focus.gif" hash="408cd33fa89269b8395bf10afe69d456"/><file name="button-min-focus.gif" hash="ae06210658bad8bcc88dea377c4dc908"/><file name="frame-left.gif" hash="1bb1207b43425d214d4dc0da108f5449"/><file name="frame-right.gif" hash="8b9c36079881aa15c27a137666c56a38"/><file name="left-top.gif" hash="1ea936a090b4dfe8160fcb3a90ddb145"/><file name="right-top.gif" hash="e1b641feab640cb4207fa52160715e32"/><file name="top-middle.gif" hash="7f94c1018d023832c7c9e1fa468a9555"/></dir><file name="alphacube.css" hash="27c968911eaef53df158c55083ef0c84"/><file name="behavior.htc" hash="5588dff36ad5595f8353730e853044e5"/><dir name="darkX"><file name="button-close-focused.png" hash="5090b529a86a79679e0a26ccb0e1b0c6"/><file name="button-maximize-focused.png" hash="0f84bfcc9626d2cb1826291268b29f20"/><file name="button-minimize-focused.png" hash="630cd8cdd7124d412c6253e5c7cfc32a"/><file name="frame-bottom-left-focused.png" hash="8a34a3be2f349315dfd287ec15148332"/><file name="frame-bottom-mid-focused.png" hash="f1dbacdb64a19e00a485d426126f26db"/><file name="frame-bottom-right-focused.png" hash="17acb7874856dc68c3c017238d42054a"/><file name="frame-left-focused.png" hash="f30ab13888b2e48d0637991164a8f748"/><file name="frame-right-focused.png" hash="1115115c62507971b2f5eed3c2c5c2d0"/><file name="titlebar-left-focused.png" hash="491130dedbdbb3b2682f37424347b14c"/><file name="titlebar-mid-focused.png" hash="ae46975fc8a5e5a9f73f810d0c88809a"/><file name="titlebar-right-focused.png" hash="9560eb10dee94985f3ebe935833e2ae4"/></dir><file name="darkX.css" hash="16a964cfe57a2c979ad3d97831673b79"/><file name="debug.css" hash="63ee9aa7b7d80e0bb5e311407746ccd3"/><dir name="default"><file name="bottom_left.gif" hash="fb99ffa815a8648f95f42698fe5dfaa1"/><file name="bottom_mid.gif" hash="49b9ca7025562ea7f070a9111282364b"/><file name="bottom_right.gif" hash="e46768f632765cd86c5fe5d0166dcf2c"/><file name="bottom_right_resize.gif" hash="1b35a4ec3b734dfe37e31ba87bcc7d99"/><file name="center_left.gif" hash="bd567580b4ee16a7a2734057cfbbe219"/><file name="center_right.gif" hash="eef184d5d89d1710313581a2ccf408e8"/><file name="clear.gif" hash="7af1206eeb0e7834a75e69d70676060d"/><file name="close.gif" hash="8a08f243c37a8e25a88d4ac135b2f07d"/><file name="inspect.gif" hash="aa2a0961067aad5c54b8634919af863b"/><file name="maximize.gif" hash="e73cd71c4979ebeadeb9e27d40a9e8fb"/><file name="minimize.gif" hash="2d2f4b1bd0506f342425f80ab76c49a3"/><file name="overlay.png" hash="536d40e87cda0c7ae7b11f1721aa52d0"/><file name="resize.gif" hash="320f534b5d444b39701e0b679529e779"/><file name="sizer.gif" hash="1b35a4ec3b734dfe37e31ba87bcc7d99"/><file name="top_left.gif" hash="9c5e5920bfc189a45cc618099af93aa8"/><file name="top_mid.gif" hash="a12ff2b944025ad2d127d033dae5e9e1"/><file name="top_right.gif" hash="0cf1ec5b93f8ac8fcce0e2f72cf7f45e"/></dir><file name="default.css" hash="16014098f441d12d06c088135e2fde28"/><dir name="iefix"><file name="blank.gif" hash="56398e76be6355ad5999b262208a17c9"/><file name="iepngfix.css" hash="da3154c9a817850376f73a7976bfcb13"/><file name="iepngfix.htc" hash="b50c4e352a64254c5ceb6c63bcd0b176"/></dir><dir name="lighting"><file name="background_buttons.gif" hash="e66e67aaaf08a7b24f3cd1ba22584b42"/><file name="bottom-left-blue.png" hash="7c9e91d421945141315fc105d464a99f"/><file name="bottom-left-darkblue.png" hash="e88c2380acf403ee28597c6045988cc6"/><file name="bottom-left-green.png" hash="ee25ce8a12229b009fbfd91f7ba51e26"/><file name="bottom-left-grey.png" hash="5fdb3eae397ac7279aa5a7fdaad3dcc2"/><file name="bottom-middle-blue.png" hash="e93cc9d31d88f45c047a98a66be04354"/><file name="bottom-middle-darkblue.png" hash="763c88c424e0900e675042d3f0958bd4"/><file name="bottom-middle-green.png" hash="77e0a22afd2c55a83b5c7fa98a12ef25"/><file name="bottom-middle-grey.png" hash="3a2ebdeff74e2ff63c4471575568dd01"/><file name="bottom-right-blue.png" hash="0bc11a61047e8716451a283ebff897e5"/><file name="bottom-right-darkblue.png" hash="88e33ea702a304ae237edd57bc8447d6"/><file name="bottom-right-green.png" hash="7bce162df013eba43a659ae6e780ae4b"/><file name="bottom-right-grey.png" hash="86eb476492d911aac5688c9747fe7a1d"/><file name="button-close-blue.png" hash="42ae1a35caf8a9a275d6e748c27769fb"/><file name="button-close-darkblue.png" hash="50dbcd898dc519c1e6ac0d3a478978cd"/><file name="button-close-green.png" hash="b4273572fa91cba909a0a3e15b994d19"/><file name="button-close-grey.png" hash="124964b634ba67f2bb6dd08cf8cafd5a"/><file name="button-maximize-blue.png" hash="85b79237d85b09c205e09166dd8f4af0"/><file name="button-maximize-darkblue.png" hash="108d10619214e3365820aa4ab008aed5"/><file name="button-maximize-green.png" hash="90f5527705e4fd81997564e81c6ac2a3"/><file name="button-maximize-grey.png" hash="c46a8c014bd14be167f4c6a2f2dd52ed"/><file name="button-minimize-blue.png" hash="1fd738b99877a4dfa5656491cc3d8e6b"/><file name="button-minimize-darkblue.png" hash="b6d9da1cdf51ab54682fa75a6df2c40d"/><file name="button-minimize-green.png" hash="9e7d26298a0a49ffee3fbab6ea838e01"/><file name="button-minimize-grey.png" hash="0432701c2425cb3a5143d8a04bda0d87"/><file name="left-blue.png" hash="0a6acf0a863c04845a93b681769527cd"/><file name="left-darkblue.png" hash="44cdce8a75de4425d7eb7763092cc38d"/><file name="left-green.png" hash="d83116c49d62dc46bff0b7b4200b4ecf"/><file name="left-grey.png" hash="f3486d3293ae98b5edb8889c4b4082ef"/><file name="pngbehavior.htc" hash="b94c44e30423fd18a8b82bda5a139db3"/><file name="right-blue.png" hash="2c9b6b80d4a6b190b8e38a1c101e828c"/><file name="right-darkblue.png" hash="9b3267c5d36bb3f4588167cc3e78e569"/><file name="right-green.png" hash="4436968c2adbe6ed7c475c225631bc7c"/><file name="right-grey.png" hash="36b3de47bcbbd6b53e2f6e06843ee6e8"/><file name="spinner.gif" hash="c7b3cbb3ec8249a7121b722cdd76b870"/><file name="top-left-blue.png" hash="a5cb9eaa82f67df223d6784a52b26f1f"/><file name="top-left-darkblue.png" hash="e4a3af23d2cae7909331eb1995963c82"/><file name="top-left-green.png" hash="eb4cb604177c342998023d3dcd3aa5b0"/><file name="top-left-grey.png" hash="9f6f39abc4ae9539a0f54567a4a5d4f8"/><file name="top-middle-blue.png" hash="6d01df8637385bbe592b8df369294c8d"/><file name="top-middle-darkblue.png" hash="2c91ea6462e72a29cd07300d4102b88a"/><file name="top-middle-green.png" hash="e0f56311091bfb370fc6783fc7e71068"/><file name="top-middle-grey.png" hash="8c02881b730d602589fe9ed4bcaeb689"/><file name="top-right-blue.png" hash="4afefb06dc63c864211724a6348f25ad"/><file name="top-right-darkblue.png" hash="d8a9031987f648f170af67023179618d"/><file name="top-right-green.png" hash="b38813f9200440051273bdd622f5e545"/><file name="top-right-grey.png" hash="d7f7332ddf8686fb9810e4170767bf52"/></dir><file name="lighting.css" hash="d13de730c8ee7ef04167d361bdf8eebd"/><file name="mac_os_x.css" hash="65204ef34c1eeff0be29c53b0614076a"/><file name="mac_os_x_dialog.css" hash="0b7cd9d6a9e8f940f50bc4a080f54b1b"/><dir name="magento"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="content_bg.gif" hash="21278ea0da2d4256f4ced96b6080ba2e"/><file name="top_bg.gif" hash="26f28090de87d64f9b01bf624f89bfe2"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="magento.css" hash="a0b153cee7655dad31ee2923657cc08a"/><dir name="nuncio"><file name="bottom_left.png" hash="d9be5c7b432a342c6da5ef9b10148267"/><file name="bottom_mid.png" hash="facee2e7ee7c572a8f412750b0ce5387"/><file name="bottom_right.png" hash="6f3c124a066a11ff225897112de8e9d7"/><file name="center_left.png" hash="a11bee83f99addccc0d5eff3d2e82b8f"/><file name="center_right.png" hash="bf6b023ad1751d5f60f9820eea72ac28"/><file name="close.png" hash="46744062a7b54416c8767f8e0ccf1c41"/><file name="minimize.png" hash="bc911a3e90fc0640e0899856759a5e01"/><file name="overlay.png" hash="5ccd88855e923eb8a1bd9da1dec9d7fe"/><file name="top_left.png" hash="d3105aacc2c69954df11af953875a12e"/><file name="top_mid.png" hash="cb679a8c77e9b7485b5f0eca547eb103"/><file name="top_right.png" hash="e65d6fc6bf53891c487e414db16f1038"/></dir><file name="nuncio.css" hash="e30e31b94d96b0b27c80ad6d943d7010"/><dir name="spread"><file name="bottom-left-c.gif" hash="84641d08576f68a11f717103365dfb83"/><file name="bottom-middle.gif" hash="20ab265c67355c5b72cdcdc8739af555"/><file name="bottom-right-c.gif" hash="cb27b72623e997badc599e76024a6e44"/><file name="button-close-focus.gif" hash="99c44a6df2733b58083af7a4d9522116"/><file name="button-max-focus.gif" hash="408cd33fa89269b8395bf10afe69d456"/><file name="button-min-focus.gif" hash="ae06210658bad8bcc88dea377c4dc908"/><file name="frame-left.gif" hash="63dc99b0c4ba0518688f7eca1f1628ca"/><file name="frame-right.gif" hash="a03585eec830f37898c7041d557dafc5"/><file name="left-top.gif" hash="7c78b8b59976d19191acf940cbfc04fb"/><file name="right-top.gif" hash="597530287fe1dc491278f855749f7e01"/><file name="top-middle.gif" hash="fa6fd6b90945c47f8d1718d9139d0a75"/><file name=".gif" hash="9dd39829e7cfdd06f3317a931bdc177e"/></dir><file name="spread.css" hash="a804413d7f1f9550c134477f6f9219ee"/></dir></dir></dir><dir name="scriptaculous"><file name="builder.js" hash="1174f6fc34ca5d54ba10b0c719386e7c"/><file name="controls.js" hash="8c414e1787c0ac9f10b16b252361c8b2"/><file name="dragdrop.js" hash="c824212f4d19277be0fd11a87a9cd0fd"/><file name="effects.js" hash="d795089f95a22306cca9b337c439c65a"/><file name="scriptaculous.js" hash="d59eba4e0b14b672208b0862ae1c2196"/><file name="slider.js" hash="6043f96a71d2685fecd02e2ab99e84d9"/><file name="sound.js" hash="0f0fab23fa2cb1bc7717fd2bdf45402e"/><file name="unittest.js" hash="99969698b22272f77bdf4c64586862b3"/></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
-</package>
diff --git a/var/package/Lib_Js_TinyMCE-3.3.7.0.xml b/var/package/Lib_Js_TinyMCE-3.3.7.0.xml
deleted file mode 100644
index b3f4bfef8d..0000000000
--- a/var/package/Lib_Js_TinyMCE-3.3.7.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Lib_Js_TinyMCE</name>
-    <version>3.3.7.0</version>
-    <stability>alpha</stability>
-    <license>Mixed</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>TinyMCE Javascript Libraries for Magento</summary>
-    <description>TinyMCE Javascript Libraries for Magento</description>
-    <notes>3.3.7.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2010-12-17</date>
-    <time>2010-12-17</time>
-    <contents><target name="mageweb"><dir name="js"><dir name="tiny_mce"><dir name="classes"><file name="AddOnManager.js" hash="de608e6d83363f5b5f94972e961b5fa0"/><file name="CommandManager.js" hash="1425aeffd5bacbfa26800b7cc06ed20f"/><file name="ControlManager.js" hash="37e08578a7ceb6248bd182d918a12007"/><file name="Developer.js" hash="14b10687623a92fccff74ba25df4fb4d"/><file name="Editor.js" hash="020978fd69fafd5eef60e663ac72b5b0"/><file name="EditorCommands.js" hash="3981341d4b9e92fb8108cfc21a637402"/><file name="EditorManager.js" hash="06ff678b9ab8c58c63131c3241a29442"/><file name="ForceBlocks.js" hash="9581f05b66ab72a3297168c490c5edd4"/><file name="Formatter.js" hash="1d1ae4db2c459554afa3743c6157a128"/><file name="LegacyInput.js" hash="a467b5b48c614fec4d04ce503a4c2dbe"/><file name="Popup.js" hash="2d46a04777ee71b4162d84aee819ffdd"/><file name="UndoManager.js" hash="8adeaf1e3e8c26521fa16601ad700714"/><file name="WindowManager.js" hash="f20e6446a94ee454649513c775e7c84a"/><dir name="adapter"><dir name="jquery"><file name="adapter.js" hash="fa9bd5124f658493e99332846943fca3"/><file name="jquery.tinymce.js" hash="ec6bd6b4b70634f2195ee947c3d0b30e"/></dir><dir name="prototype"><file name="adapter.js" hash="1dcad348dc02cd993b563b141dc42dd2"/></dir></dir><dir name="dom"><file name="DOMUtils.js" hash="5284e5986f95aa770e8987e43c0a9ce6"/><file name="Element.js" hash="c5b5586e2646d9bea8d95f1ce5bc0531"/><file name="EventUtils.js" hash="b5a9dc603139ccba7feba82dae6af831"/><file name="Range.js" hash="997d6f4755ce570b6cb3955d464ff11b"/><file name="RangeUtils.js" hash="6344fc8651e8a2680681dee34a73ee06"/><file name="Schema.js" hash="fcd137dc9b99961b66ed9d4df8504987"/><file name="ScriptLoader.js" hash="aee37aa9bbb4adb5e5ea5deb4808182f"/><file name="Selection.js" hash="9c48c06eb423890f19938f1095a5250e"/><file name="Serializer.js" hash="5776714eb473d67193c9a5e8b7fb863e"/><file name="Sizzle.js" hash="43535dc856e00e734a0b9a9148962ef3"/><file name="StringWriter.js" hash="01a9d31db6931f842214217c786e2d41"/><file name="TreeWalker.js" hash="6c5909cd113751688918b22d0f09553b"/><file name="TridentSelection.js" hash="3229473e23fda913f032a3dedbe615f1"/><file name="XMLWriter.js" hash="3d5213060c62554032464e1a79031fb2"/></dir><dir name="firebug"><file name="firebug-lite.js" hash="1c9c10926be94a61564ad0541a50624f"/></dir><file name="tinymce.js" hash="f318fa84d751db5417b203fa6a9b6678"/><dir name="ui"><file name="Button.js" hash="b3c02225bd8f7fadf21c8651a2080505"/><file name="ColorSplitButton.js" hash="98a8db6eb3532501a4fdcb2703a4795c"/><file name="Container.js" hash="3de39420eec9369b0fe0c1603ae9e546"/><file name="Control.js" hash="4d5a3132f8d248132802ab8657abc54e"/><file name="DropMenu.js" hash="0330bc33c8cfa8f7cf6155772c01ec87"/><file name="ListBox.js" hash="84a422bbf107b6cebcb819004d769aad"/><file name="Menu.js" hash="72f713383d63e930dbd472cd87cabe73"/><file name="MenuButton.js" hash="ef98f7f9482c021b49f2fa6fabc84cb1"/><file name="MenuItem.js" hash="9e596567a9655ae7ad9a23ee5464e1f9"/><file name="NativeListBox.js" hash="b6ef7b5c67bd3962718c5ae58bcec288"/><file name="Separator.js" hash="8a046431d99c53ec58e504a6cb87b23b"/><file name="SplitButton.js" hash="5e128d80fb7f434b5aee0c05b6807fde"/><file name="Toolbar.js" hash="695b8f0ad7ed51bb26e38831f56ebb8b"/></dir><dir name="util"><file name="Cookie.js" hash="90b2ec5a1b3b53fb296538821fdb53f1"/><file name="Dispatcher.js" hash="93232725a6c90b9347d2b19134240838"/><file name="JSON.js" hash="dc0747ec71301c844242777d991334ed"/><file name="JSONP.js" hash="a0c7dd36203d3953acf31ee3a38a8996"/><file name="JSONRequest.js" hash="93754cecd28e3a9a2595019cc981d4af"/><file name="URI.js" hash="8ec2d89783c6153510341d408526910a"/><file name="XHR.js" hash="f42b051b9770790e95032b9d7a86190f"/></dir><dir name="xml"><file name="Parser.js" hash="c6d6862014ef2ab23a5a16adaee1af6d"/></dir></dir><file name="jquery.tinymce.js" hash="790c9b2c068efdc7ef4c070bb47d3f9a"/><dir name="langs"><file name="en.js" hash="f54e1ea7fc86c205c1b0bfbb8ec569a2"/></dir><file name="license.txt" hash="0571cf371683742c14f1735079a78e38"/><dir name="plugins"><dir name="advhr"><dir name="css"><file name="advhr.css" hash="15df80b2137bcc04d5455ffa3a51e0c5"/></dir><file name="editor_plugin.js" hash="d0a03059205455e5c19cf3a845a0ebde"/><file name="editor_plugin_src.js" hash="a7fda2e674f15a33baf53cea2e23ec66"/><dir name="js"><file name="rule.js" hash="ef46d7c850c8bcc869ea84ed7ac00c49"/></dir><dir name="langs"><file name="en_dlg.js" hash="297a5821a89f9b759c57ff77e8dfecca"/></dir><file name="rule.htm" hash="bb16b0b8feab8a604b14be9ae6da66e7"/></dir><dir name="advimage"><dir name="css"><file name="advimage.css" hash="1ccd374d5f1e89cc16e1649558a9bb33"/></dir><file name="editor_plugin.js" hash="6634dc710b837855baff6d4d3a4f290e"/><file name="editor_plugin_src.js" hash="5134485db327459f7b10de273b50a5e8"/><file name="image.htm" hash="6317ffa9f6c8c5e9b154c0afdafafd43"/><dir name="img"><file name="sample.gif" hash="b9c7057c46716340e8967340ad11766e"/></dir><dir name="js"><file name="image.js" hash="63dc4114f95a31649b04ba019ecc0da7"/></dir><dir name="langs"><file name="en_dlg.js" hash="3b21c2c0990c044ed3e06f08504baa71"/></dir></dir><dir name="advlink"><dir name="css"><file name="advlink.css" hash="aaf226732a7b4ae80ee680700f488a1e"/></dir><file name="editor_plugin.js" hash="5e440c6bcb7fd94e7fd597f8a183e16f"/><file name="editor_plugin_src.js" hash="4104cd66aea546becf5d8fca66cf7951"/><dir name="js"><file name="advlink.js" hash="99b5bf24438ceeba3091fe6713365adc"/></dir><dir name="langs"><file name="en_dlg.js" hash="38dca13d848c8074b38e20b2a33e6eaf"/></dir><file name="link.htm" hash="acf75c39574ed15cc72166a78f430358"/></dir><dir name="advlist"><file name="editor_plugin.js" hash="ee82521107bc8980b09527a1917e5ccd"/><file name="editor_plugin_src.js" hash="f6527ec1e7b0c8a9019de139e7650a2e"/></dir><dir name="autoresize"><file name="editor_plugin.js" hash="8f831bdcf6a177b5b23c7b79ec6f8a06"/><file name="editor_plugin_src.js" hash="98bb9d5fd2ea763fdbf3a506c9580ce1"/></dir><dir name="autosave"><file name="editor_plugin.js" hash="cac731283c908dc1dd2bda64424d964c"/><file name="editor_plugin_src.js" hash="7540f06776c6f3e5ca7d6f88b2f0ab35"/><dir name="langs"><file name="en.js" hash="a33b0322c949a6d74bde7fa164396984"/></dir></dir><dir name="bbcode"><file name="editor_plugin.js" hash="0539055daa100b90540707c5eb5ea67b"/><file name="editor_plugin_src.js" hash="5b9a03862f199c73456dbbea745bc29d"/></dir><dir name="contextmenu"><file name="editor_plugin.js" hash="af9c25cf256c5c815310cba1c702ab5f"/><file name="editor_plugin_src.js" hash="d9c03f69769d042aca26c95e8b7b2251"/></dir><dir name="directionality"><file name="editor_plugin.js" hash="653c3a89058b610fd12242faf4f01cdf"/><file name="editor_plugin_src.js" hash="f55b4200e9f8ffb2ffb7c7c17e19b30a"/></dir><dir name="emotions"><file name="editor_plugin.js" hash="98cba02e33fc108024f3e993be0b0b62"/><file name="editor_plugin_src.js" hash="4cbc6e9b083a810ab0d3768af8f8f864"/><file name="emotions.htm" hash="66948a60092333144d8095f194b1bdd7"/><dir name="img"><file name="smiley-cool.gif" hash="e26e97a318f82ec144b0818e5a8f8edb"/><file name="smiley-cry.gif" hash="e72bf995ceca9230273ed9909c5db9c8"/><file name="smiley-embarassed.gif" hash="d59171236e6b0b96091eeda1f7b57ce3"/><file name="smiley-foot-in-mouth.gif" hash="905294088277f201be5a8e0285fb7998"/><file name="smiley-frown.gif" hash="59930208822fe755f651a67ef4b70530"/><file name="smiley-innocent.gif" hash="ec0477c8a206ff250782e40f9bae4b4c"/><file name="smiley-kiss.gif" hash="4ae8945f3960751b5d294f18242e144d"/><file name="smiley-laughing.gif" hash="b691cfd07d8181059f8a4b041d534cc4"/><file name="smiley-money-mouth.gif" hash="11c14bd1496afd0e21df115d25b68e96"/><file name="smiley-sealed.gif" hash="28b9401b59fb7ad10b96f57aaa2630c4"/><file name="smiley-smile.gif" hash="c676407db519bdf42481870746f097d8"/><file name="smiley-surprised.gif" hash="eff5a6fbfb80ca2d3ae929b0a1c15638"/><file name="smiley-tongue-out.gif" hash="5ec3bb4781c8e43a51d3a1a948b98fc0"/><file name="smiley-undecided.gif" hash="3c0c011d16b1a2331385ed97e160a42a"/><file name="smiley-wink.gif" hash="4ae6aa98aa63363c16ea74f927696bd9"/><file name="smiley-yell.gif" hash="19bb8ebfe3c2f5ef3ffb9aa4a027900d"/></dir><dir name="js"><file name="emotions.js" hash="ca781c5bd11767e1bbd86934343d7d0e"/></dir><dir name="langs"><file name="en_dlg.js" hash="1ed9d59b2b02aa2946218997a67424a8"/></dir></dir><dir name="example"><file name="dialog.htm" hash="e6170a190a4d44ea5e6af089d2728d7e"/><file name="editor_plugin.js" hash="e0a175dca3d5e437657ccd5d548ff409"/><file name="editor_plugin_src.js" hash="3fcff53aee2c0828db3a4e9e78f9b580"/><dir name="img"><file name="example.gif" hash="6036655a01df362267183a8b23fead10"/></dir><dir name="js"><file name="dialog.js" hash="83245e76c97e24d466cf5df2308f9bf4"/></dir><dir name="langs"><file name="en.js" hash="78c88182b5fb900fc956845f75885b3a"/><file name="en_dlg.js" hash="7aec7a3b9d4642fbf7bb3ef1ed8a7570"/></dir></dir><dir name="fullpage"><dir name="css"><file name="fullpage.css" hash="0a4e4c9cbbc258fbe124848de31e2ddf"/></dir><file name="editor_plugin.js" hash="2700900aac7d44a70e65c92427be6cae"/><file name="editor_plugin_src.js" hash="364c4cd1c718488318f13402b10a429f"/><file name="fullpage.htm" hash="ce2e622d549969f93b8806aff69113e2"/><dir name="js"><file name="fullpage.js" hash="bf32a127219fc60b2755c7fab7042f75"/></dir><dir name="langs"><file name="en_dlg.js" hash="5808457feccdc0e688451ce3a050a7ce"/></dir></dir><dir name="fullscreen"><file name="editor_plugin.js" hash="89f4e23300ce29d55b985a37f61d95f0"/><file name="editor_plugin_src.js" hash="0f7581a4469ea4ad50d149b4f1583535"/><file name="fullscreen.htm" hash="60efa08e95ed2f932c0bcdbb0cce1f4c"/></dir><dir name="iespell"><file name="editor_plugin.js" hash="22526393cacb6447a0e3bfff2fb47773"/><file name="editor_plugin_src.js" hash="311e13bcc85c06da43decc37dc1b4f83"/></dir><dir name="inlinepopups"><file name="editor_plugin.js" hash="bfaaa63c2867a7c1aa80783e423a9b87"/><file name="editor_plugin_src.js" hash="d56834d4575ad417e587201164dda415"/><dir name="skins"><dir name="clearlooks2"><dir name="img"><file name="alert.gif" hash="56646a5e811547c8bc3d1b9790496b89"/><file name="button.gif" hash="9e911a2c3cb4720d44844ef2d1832a51"/><file name="buttons.gif" hash="1743ac9f7f2267a6edafefc536a2265d"/><file name="confirm.gif" hash="44f1d55b14fbc66b98f3899d90611c3c"/><file name="corners.gif" hash="2e89a17a473f0e488f3e789ce998f064"/><file name="horizontal.gif" hash="0365e75dd4a9ad61dc98dcb641207c21"/><file name="vertical.gif" hash="193884a332e91059643448ed4bde2e04"/></dir><file name="window.css" hash="5e33280ecbcbc97d23f44ba1d23b578a"/></dir></dir><file name="template.htm" hash="3d7e3ae05511a9f64c5da924b9e971ba"/></dir><dir name="insertdatetime"><file name="editor_plugin.js" hash="d99072498466cdb2f53ed7c02da85982"/><file name="editor_plugin_src.js" hash="32a2afa1cd3ff8c9b966f8724ba3e0b3"/></dir><dir name="layer"><file name="editor_plugin.js" hash="b301ba78b2361b391cab4efffb88d101"/><file name="editor_plugin_src.js" hash="4ec0e9e0ea565dc4e10152c432f0690f"/></dir><dir name="legacyoutput"><file name="editor_plugin.js" hash="12aa4310f6c246d70441443dab1b14f9"/><file name="editor_plugin_src.js" hash="5d435559087d0f3055d0bdb30bc2cc58"/></dir><dir name="media"><dir name="css"><file name="content.css" hash="4d548fc3798c1aa73988281f67b45654"/><file name="media.css" hash="ed1c69491da2f06b560e2167505c405f"/></dir><file name="editor_plugin.js" hash="4293b412afc9ed2923de50a8ff452bc1"/><file name="editor_plugin_src.js" hash="41b5c198b6b33448d41e6b52a6ae0baa"/><dir name="img"><file name="flash.gif" hash="6c69b02015d09280332ff8b07e4ea2f3"/><file name="flv_player.swf" hash="fe011e9725b2722b59bb8ef4991bf6bb"/><file name="quicktime.gif" hash="9a6a9fdead205b125c07ea37e71ed4f1"/><file name="realmedia.gif" hash="b9734ee16d790e67bea01046feba28b7"/><file name="shockwave.gif" hash="baa643b587565755157618032dc93e3c"/><file name="trans.gif" hash="12bf9e19374920de3146a64775f46a5e"/><file name="windowsmedia.gif" hash="c327cd167b3a7bc263d908b0d0154ead"/></dir><dir name="js"><file name="embed.js" hash="39ebc57f44e1cc683724e1c1ff761894"/><file name="media.js" hash="5fac3b4e732edda25a2810884f607bdf"/></dir><dir name="langs"><file name="en_dlg.js" hash="b067e5f4a3b60ebd4acf26dbbdb2cec6"/></dir><file name="media.htm" hash="2429dc83f834fffa558cbce15ff22b46"/></dir><dir name="nonbreaking"><file name="editor_plugin.js" hash="f060d50dea8eae559e959618fc980c7c"/><file name="editor_plugin_src.js" hash="85f4a48c4a86577b1fa7d15227a5183e"/></dir><dir name="noneditable"><file name="editor_plugin.js" hash="3f456605e83505bb0571144cc5f14b59"/><file name="editor_plugin_src.js" hash="6ecdc7bf292835bead510d9d031eed83"/></dir><dir name="pagebreak"><dir name="css"><file name="content.css" hash="d9664762a610f2b5f7b10b5781f3299a"/></dir><file name="editor_plugin.js" hash="895bcb74c5c6941dd8f7e6c9bd1b29c8"/><file name="editor_plugin_src.js" hash="a3619dfb7e2f1764691326f38d088b10"/><dir name="img"><file name="pagebreak.gif" hash="48872075f721bf57a517e3275d61c0ba"/><file name="trans.gif" hash="12bf9e19374920de3146a64775f46a5e"/></dir></dir><dir name="paste"><file name="editor_plugin.js" hash="589f22272645efa14b14cba96996d04c"/><file name="editor_plugin_src.js" hash="588b009516f0ec2e16a76c24b36b30e5"/><dir name="js"><file name="pastetext.js" hash="d6e4b39f19b89118b34b0d21491494b7"/><file name="pasteword.js" hash="112504d12e971e4d32f17a59c5616c36"/></dir><dir name="langs"><file name="en_dlg.js" hash="aa388d5558885cf8f4c6ec3eb4ca3a7a"/></dir><file name="pastetext.htm" hash="8f217769e59a5dd67843c7c17c842f41"/><file name="pasteword.htm" hash="8b9459b98f9a70ed684832326bf1cdf6"/></dir><dir name="preview"><file name="editor_plugin.js" hash="925216b63aabd5adc67d642ca2d04b4a"/><file name="editor_plugin_src.js" hash="6f9c3234dfdc0f62b713e8771f4ca5dc"/><file name="example.html" hash="9b9290408ae10fa29ec29db60682be91"/><dir name="jscripts"><file name="embed.js" hash="39ebc57f44e1cc683724e1c1ff761894"/></dir><file name="preview.html" hash="bb02414f4cdd28c4a66e7fb5ed820f2d"/></dir><dir name="print"><file name="editor_plugin.js" hash="53eb1da78f727ee8337671fb86354c17"/><file name="editor_plugin_src.js" hash="f11547aa114df69b35df319003105e11"/></dir><dir name="save"><file name="editor_plugin.js" hash="307a0743c68c4e4aff005f13027f296f"/><file name="editor_plugin_src.js" hash="4dcbdaab64f06550a2db2b650f99d411"/></dir><dir name="searchreplace"><dir name="css"><file name="searchreplace.css" hash="ad0addca1bd5727432f39ec9b7fdac1e"/></dir><file name="editor_plugin.js" hash="53c400709c76c824b9fe05bf94656fbc"/><file name="editor_plugin_src.js" hash="70842df1c46ef6552e8e39e8023c0ac3"/><dir name="js"><file name="searchreplace.js" hash="cfbcf0233edc04dd52ff698299594513"/></dir><dir name="langs"><file name="en_dlg.js" hash="5f735d67877a4ecb9faf4ca19d2035dd"/></dir><file name="searchreplace.htm" hash="aad4c6a0602dc88342886239b4318543"/></dir><dir name="spellchecker"><dir name="css"><file name="content.css" hash="ac0c7dbbbe44022d29d63b7b05123e3d"/></dir><file name="editor_plugin.js" hash="a6caa5803d9a816cf69b6daca27cb6de"/><file name="editor_plugin_src.js" hash="80c756019892dca27463665d1ec3f7e0"/><dir name="img"><file name="wline.gif" hash="c136c9f8e00718a98947a21d8adbcc56"/></dir></dir><dir name="style"><dir name="css"><file name="props.css" hash="3442be519751bad52b23dc35a1de30d5"/></dir><file name="editor_plugin.js" hash="ac96cb192e649f92a42b9ce339092008"/><file name="editor_plugin_src.js" hash="f3fe95aa447b856e589a48b78c0556f8"/><dir name="js"><file name="props.js" hash="8d393f8e39609188e7f0a668d4c38ab1"/></dir><dir name="langs"><file name="en_dlg.js" hash="1e069c2c7583b278b3cab074d1ff07d9"/></dir><file name="props.htm" hash="dde0f961dd8065e3019d181a0586a679"/></dir><dir name="tabfocus"><file name="editor_plugin.js" hash="15397ee0ab8280702de894ed2c8e9e40"/><file name="editor_plugin_src.js" hash="25383c65e70b10e8a759801b7ab9566e"/></dir><dir name="table"><file name="cell.htm" hash="0db1ac5138f19b8c9e1e6a3c65200574"/><dir name="css"><file name="cell.css" hash="56394e6cdb267d97e23a07a98820e84b"/><file name="row.css" hash="81a75523c1e83be93e524c8bb901a089"/><file name="table.css" hash="f5e651f5a32284f1c4e0faa1d7cd5ff4"/></dir><file name="editor_plugin.js" hash="43d27e5e58b195b45fc80ed914a63d4d"/><file name="editor_plugin_src.js" hash="0aa3aa15a819d5888b446d641230e215"/><dir name="js"><file name="cell.js" hash="cf99b83df68a589276fb092e345bc961"/><file name="merge_cells.js" hash="3650484c93d6c9a197d03a5c3c3d2e80"/><file name="row.js" hash="aa39f22708fbff50b6a5b7ecc5bc074b"/><file name="table.js" hash="347bdaad580adeb61ee51c0175819a9a"/></dir><dir name="langs"><file name="en_dlg.js" hash="9828ab260a60ea25a88b7657c937f666"/></dir><file name="merge_cells.htm" hash="aa4adb853b442af2bf6164276f23d5e0"/><file name="row.htm" hash="072be8a0ff2b4680c6d596383ad5af5b"/><file name="table.htm" hash="84b70f7c6796fad9a1bd953901d8406c"/></dir><dir name="template"><file name="blank.htm" hash="9553e76581d74579d23bea5c7ea8a807"/><dir name="css"><file name="template.css" hash="5b2c159120cbef004c9b0804c292820b"/></dir><file name="editor_plugin.js" hash="70cb20c4e287110ae8aeed999893c532"/><file name="editor_plugin_src.js" hash="336af7b2ec3e0f7c83a7d05bf16cd018"/><dir name="js"><file name="template.js" hash="48fe76a8ef588730634bd4e76aec32f8"/></dir><dir name="langs"><file name="en_dlg.js" hash="909605f964df80b19f22e51484fb2274"/></dir><file name="template.htm" hash="b55e174e239e5c4b3a52d6ad60eb991d"/></dir><dir name="visualchars"><file name="editor_plugin.js" hash="11d78c14f93845ad28f76c83bd989732"/><file name="editor_plugin_src.js" hash="f9fca4b105cd8d671ad27d88a58a7187"/></dir><dir name="wordcount"><file name="editor_plugin.js" hash="46cb9be28db5e11187e57a3507a78d80"/><file name="editor_plugin_src.js" hash="dbde0ee87cff24ff11340e29643b0d67"/></dir><dir name="xhtmlxtras"><file name="abbr.htm" hash="109c1839c713aa6fe26a45b00a6f3ee8"/><file name="acronym.htm" hash="ceaa5f21d8227e1b212672baab37889b"/><file name="attributes.htm" hash="299e3569aacf8d20dca7bb9dad7f1e4a"/><file name="cite.htm" hash="296fe99bb3401689b0ef93c5fcde5a72"/><dir name="css"><file name="attributes.css" hash="abc1b941c6eef8e1ea76915984e8a03e"/><file name="popup.css" hash="ed53e7b6ab799f6a249c3d403047dcfc"/></dir><file name="del.htm" hash="38c3b0c1567ef427c8cfaf5b2ca7f594"/><file name="editor_plugin.js" hash="e7dc811ac6ebd20568aa99b201f03376"/><file name="editor_plugin_src.js" hash="dfed1f0fb5f837113e2c72ce7468fcdb"/><file name="ins.htm" hash="0bd819c9e634374fa28067b6e2bbff83"/><dir name="js"><file name="abbr.js" hash="d91ae7d986336de4ecb977d19dcfab19"/><file name="acronym.js" hash="0a19f79bdc9222d3273712fe37a8051c"/><file name="attributes.js" hash="c2627256b3039e49983ff53d0fcb5c27"/><file name="cite.js" hash="ba39487ce6a625538b838c21502bbaa7"/><file name="del.js" hash="a0f78a357ef08838b1c3ea677260e071"/><file name="element_common.js" hash="ac65011064cf320b7eb4e3451c848a54"/><file name="ins.js" hash="482bdcf564f171f510d3ccb2db25915a"/></dir><dir name="langs"><file name="en_dlg.js" hash="31b9e42bcfd8480373e9d2ca2b333b78"/></dir></dir></dir><dir name="themes"><dir name="advanced"><file name="about.htm" hash="55ceeb6320e97adfa522e15a0ebef281"/><file name="anchor.htm" hash="4d73bbb9ca45f9eb077567b865e6c0f1"/><file name="charmap.htm" hash="97cb3b66faf1f8683d19aa908748c34b"/><file name="color_picker.htm" hash="31c816e60d1d967746d674f84ccb58ce"/><file name="editor_template.js" hash="0255189012b3e95e69402d615c8c763e"/><file name="editor_template_src.js" hash="78a5d771576dbe93f6d6b45d5bac8696"/><file name="image.htm" hash="1f706072ea4ef41282bd285fec92535d"/><dir name="img"><file name="colorpicker.jpg" hash="02ae48639aa5729e6a40fb64455c32a2"/><file name="icons.gif" hash="092b023d8d0073b8f651a92a1f711ccd"/></dir><dir name="js"><file name="about.js" hash="73308b59a9305e9e2f9a4a9c1b538442"/><file name="anchor.js" hash="a52835281645e4c85f0cadf56783d48f"/><file name="charmap.js" hash="eea45e66eb4d2d920e0875708766c9b2"/><file name="color_picker.js" hash="560e2bd8c4b72557ed2a71a04ff7d39a"/><file name="image.js" hash="6b84a9a6983d2960c389176f77dfae78"/><file name="link.js" hash="956f82c027adf77cc88fb639b946f309"/><file name="source_editor.js" hash="72284ff9e905cff4f228f0f9a6f76c12"/></dir><dir name="langs"><file name="en.js" hash="91c93bcdb9bad88b46b0f9be597e4dab"/><file name="en_dlg.js" hash="c855d4c47b333fb42727cc5634d72d49"/></dir><file name="link.htm" hash="48b06b3128dee07df6d37b9e6624d15d"/><dir name="skins"><dir name="default"><file name="content.css" hash="100bf5983ee03c36f8c8145d1551cbf6"/><file name="dialog.css" hash="416e2b0cfec24302f776fd406981a325"/><dir name="img"><file name="buttons.png" hash="1e0acdc2135897e6a95bb40cfde2fbc6"/><file name="items.gif" hash="5cb42865ce70a58d420786854fed4ae1"/><file name="menu_arrow.gif" hash="e21752451a9d80e276fef7b602bdbdba"/><file name="menu_check.gif" hash="c7d003885737f94768eecae49dcbca63"/><file name="progress.gif" hash="50c5e3e79b276c92df6cc52caeb464f0"/><file name="tabs.gif" hash="93f97588a35da1f45fdcb975d4380913"/></dir><file name="ui.css" hash="0568a7ee2a87cb106c964fc4bdf1ae20"/></dir><dir name="o2k7"><file name="content.css" hash="db55e841042f4a4683e76e0de2a9315d"/><file name="dialog.css" hash="a4d2a9943b3ee2c3b3d5d4178ae327f7"/><dir name="img"><file name="button_bg.png" hash="8c9b1f0ee9deb6374983650edbd6ddfc"/><file name="button_bg_black.png" hash="a5ad448e9c25120cb7e05fffe4a6234f"/><file name="button_bg_silver.png" hash="5690ef573f4dc74ec3eb4d101806976e"/></dir><file name="ui.css" hash="f5fcf6c263a9b02ada0266dbbd86b0eb"/><file name="ui_black.css" hash="524c71b474032566e351397cab161fba"/><file name="ui_silver.css" hash="bbf2b4fcf6dbfb4afb23c1b88ae60b29"/></dir></dir><file name="source_editor.htm" hash="23e1cb2b725db576b6acaa9257c96e02"/></dir><dir name="simple"><file name="editor_template.js" hash="7631da315121f802e49dd27222b58ade"/><file name="editor_template_src.js" hash="37ba4f48eaa33f8a3ec5186f65440cad"/><dir name="img"><file name="icons.gif" hash="749151955998f915596270f8c452af6e"/></dir><dir name="langs"><file name="en.js" hash="658825dba927895369581022c3594b85"/></dir><dir name="skins"><dir name="default"><file name="content.css" hash="0f70f3ca9624e252d1c41ea064fc65e7"/><file name="ui.css" hash="c46c68283c617bb61dada1cd2494dd9f"/></dir><dir name="o2k7"><file name="content.css" hash="eb7a087c67578b6e3b5e0987caa4ba64"/><dir name="img"><file name="button_bg.png" hash="405ca3d63b48667ef485553192507f59"/></dir><file name="ui.css" hash="f0ec0273462e01b81e1dfd292f64451e"/></dir></dir></dir></dir><file name="tiny_mce.js" hash="38eae192ab32178dd7e37563cf661f65"/><file name="tiny_mce_dev.js" hash="44f7066d1d5da7905728a77ec14977ce"/><file name="tiny_mce_jquery.js" hash="88701815fb77cb1aa68ade0b3ea4408b"/><file name="tiny_mce_jquery_src.js" hash="2bccd5cea0fc16e649e203dd47edb8f8"/><file name="tiny_mce_popup.js" hash="677d2f88ae991728c80ef15d112652b2"/><file name="tiny_mce_prototype.js" hash="cd84565185dcdb29f2b5007f3b8cddfa"/><file name="tiny_mce_prototype_src.js" hash="41b6dbf79c4b729541d32fe1e7a8cbb0"/><file name="tiny_mce_src.js" hash="635f09e983557c9b156cd03179faaddb"/><dir name="utils"><file name="editable_selects.js" hash="8fb83cb7c34f86b2b7dc5dfe0f482e3f"/><file name="form_utils.js" hash="14f7de5e0b5afb86062b4e05c3101b55"/><file name="mctabs.js" hash="a81ad17d806f4c2ce30b9b844363fdbf"/><file name="validate.js" hash="167fc7fa0f4c43528d5470f15109898b"/></dir></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
-</package>
diff --git a/var/package/Lib_LinLibertineFont-2.8.14.0.xml b/var/package/Lib_LinLibertineFont-2.8.14.0.xml
deleted file mode 100644
index b9634a539f..0000000000
--- a/var/package/Lib_LinLibertineFont-2.8.14.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Lib_LinLibertineFont</name>
-    <version>2.8.14.0</version>
-    <stability>alpha</stability>
-    <license uri="http://www.gnu.org/licenses/gpl.html">GPL</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Libertine Open Fonts Project fonts for PDF print-outs</summary>
-    <description>Libertine Open Fonts Project fonts for PDF print-outs</description>
-    <notes>2.8.14.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2010-12-17</date>
-    <time>2010-12-17</time>
-    <contents><target name="magelib"><dir name="LinLibertineFont"><file name="Bugs" hash="9ecefd5b5d739618917f6ff1a496af4d"/><file name="ChangeLog.txt" hash="c4a43af51dc70f4acbd09eeda8a1f95d"/><file name="GPL.txt" hash="ae32e069c670f1247694f4313efcc977"/><file name="LICENCE.txt" hash="9752e08000ee88048cb953607250dd7b"/><file name="LinLibertineC_Re-2.8.0.ttf" hash="7c98097ee899568bc86c28a8eafd77a3"/><file name="LinLibertine_Bd-2.8.1.ttf" hash="81c9c61a6c91fc6ccb93f1e6ec6ed06a"/><file name="LinLibertine_It-2.8.2.ttf" hash="5d334990c5d59bd428ae684ce8490c5c"/><file name="OFL.txt" hash="6237e6976dcefd3d9fc3f1264b3c3bb9"/><file name="Readme" hash="9bbff4f7c21eb0a037527720e4b8473d"/><file name="Readme-TEX.txt" hash="14cb95ee0acecf6c3ef563f1b906443b"/></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
-</package>
diff --git a/var/package/Lib_Mage-1.5.0.0.xml b/var/package/Lib_Mage-1.5.0.0.xml
deleted file mode 100644
index 55a0992150..0000000000
--- a/var/package/Lib_Mage-1.5.0.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Lib_Mage</name>
-    <version>1.5.0.0</version>
-    <stability>stable</stability>
-    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Mage Library</summary>
-    <description>Mage Library</description>
-    <notes>1.5.0.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:01:02</time>
-    <contents><target name="magelib"><dir name="Mage"><dir name="Archive"><file name="Abstract.php" hash="facb355053858f94439409d8657757ff"/><file name="Bz.php" hash="bce512d3062f936f1a8c12bf5c408b64"/><file name="Gz.php" hash="0dca1839014c71886a8a93186bb993d0"/><file name="Interface.php" hash="ef441008981545b886dcab6f386a6882"/><file name="Tar.php" hash="9f09ed124af89b683897246503ea9832"/></dir><file name="Archive.php" hash="f7745fb5794efd8e0a2adaef4a3f6f12"/><dir name="Autoload"><file name="Simple.php" hash="0112e880807596fbe8822be12314f14f"/></dir><dir name="Connect"><dir name="Channel"><file name="Generator.php" hash="a1f115e909680bca8c1b1f0940244b13"/><file name="Parser.php" hash="ec2e7380ec4bca81de2795f96975e778"/><file name="VO.php" hash="870a1b9b28d85dd72b2b1e2529dca354"/></dir><dir name="Command"><file name="Channels.php" hash="12f730285615329cba0b570385009837"/><file name="Channels_Header.php" hash="934366a4daa1ebe87b25cb9dfa061798"/><file name="Config.php" hash="5091776f35732d8b0ff12c8ff3561c69"/><file name="Config_Header.php" hash="119a103ed71b326993756961b6c7c2a0"/><file name="Install.php" hash="2f7227a1f4003d6ce6edec4a0ce02e0f"/><file name="Install_Header.php" hash="71f0b6bad2f745235352d181bcc66645"/><file name="Package.php" hash="b36bdc6a3c0f6bc9d7766a37c046a481"/><file name="Package_Header.php" hash="dc3840a95f89ef844df40c585582815d"/><file name="Registry.php" hash="f9fde28940ff38dbc336335d575a295d"/><file name="Registry_Header.php" hash="559edbac0f3d267c8ca289e526b940d1"/><file name="Remote.php" hash="6f959617993d58aec974d578921b6212"/><file name="Remote_Header.php" hash="4b56cd683710de6c81241f902570ba25"/></dir><file name="Command.php" hash="0d474da0956a292aa83e88da4975c527"/><file name="Config.php" hash="511f752123ccc6c148a6a308fc3f81b2"/><file name="Converter.php" hash="1cde84613c6079050bb3824aba3b380d"/><dir name="Frontend"><file name="CLI.php" hash="86e6631d9345d5bf9d15148cfdace3bf"/></dir><file name="Frontend.php" hash="0a97c590fdc9844b225638d631315d35"/><file name="Ftp.php" hash="095b9ad01ea60418b1667732cb374d95"/><dir name="Loader"><file name="Ftp.php" hash="0ca46737d25bf0eb321414f2d8b7ced0"/></dir><file name="Loader.php" hash="009d6f986d5ff406f7e94d2b395f6e25"/><dir name="Package"><file name="Extension.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="Hotfix.php" hash="850bd23783a77dbf6f50b4f169c2c7b3"/><file name="Maintainer.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="Reader.php" hash="ca384e066ac21168e0a7aebc5da869c1"/><file name="Target.php" hash="351af5965f7870d3f4e960d402805b17"/><file name="VO.php" hash="9ffbdff9210474b68db7caddf9a5fe5a"/><file name="Writer.php" hash="431f107ab2ffd1977f74a94ae16481d1"/></dir><file name="Package.php" hash="2df5f5a222c9e45bb9e4d8c0e5e6d170"/><file name="Packager.php" hash="37df01e250a103684b37a6f0b71b3128"/><dir name="Repository"><file name="Abstract.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><dir name="Channel"><file name="Abstract.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="Commercial.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="Community.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="Core.php" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><file name="Channel.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="Local.php" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><file name="Repository.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="Rest.php" hash="ba2d2365fc989274940e1fdff6476875"/><file name="Singleconfig.php" hash="975c04d57cbce24327e84a93d9f5443e"/><dir name="Structures"><file name="Graph.php" hash="b85283fd2af6fd54fb748cb6ea933842"/><file name="Node.php" hash="26a7e4041c3d2fd93bfdc3c692c85ede"/></dir><file name="Validator.php" hash="3ac1b21ec703073d5dd9b5dda3471fe8"/></dir><dir name="DB"><file name="Exception.php" hash="e0b55d77af8e215135ef223f593832ad"/><file name="Mysqli.php" hash="5057ea65f441bbb00c7e55298e9252a4"/></dir><file name="Exception.php" hash="9bf1aefdb7fd166d25889f36707997dc"/><dir name="HTTP"><dir name="Client"><file name="Curl.php" hash="f537a9879781ec3fe2748677bee43737"/><file name="Socket.php" hash="7a889fed729d92eba849d6fdfa32d7d6"/></dir><file name="Client.php" hash="7072f9366680bc5ebc1c447700193cb4"/><file name="IClient.php" hash="88a4a88a31a05a2154d430d7b4308ff6"/></dir><dir name="System"><file name="Args.php" hash="8080a06707f4393b9155441ed4160f4a"/><file name="Dirs.php" hash="adc832887e04f359b2ec050b0b2e6d17"/></dir><dir name="Xml"><file name="Generator.php" hash="0ddc93b0c75885f67d049d0a38c630fa"/><file name="Parser.php" hash="b2bdc0880cd5bc2d82468ee075e783a2"/></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
-</package>
diff --git a/var/package/Lib_Phpseclib-1.5.0.0.xml b/var/package/Lib_Phpseclib-1.5.0.0.xml
deleted file mode 100644
index 8324bc128f..0000000000
--- a/var/package/Lib_Phpseclib-1.5.0.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Lib_Phpseclib</name>
-    <version>1.5.0.0</version>
-    <stability>stable</stability>
-    <license uri="http://www.gnu.org/licenses/lgpl.txt">LGPL v.3</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Phpseclib Library</summary>
-    <description>Phpseclib Library</description>
-    <notes>1.5.0.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:01:02</time>
-    <contents><target name="magelib"><dir name="phpseclib"><dir name="Crypt"><file name="AES.php" hash="6af09e1f2da7eb069760d788ee0d54e0"/><file name="DES.php" hash="1b75baa9ddad68309b8e82a6cebc8dc1"/><file name="Hash.php" hash="f8ca80e79e2d570afeb2f78023f213d4"/><file name="RC4.php" hash="2e507f5635b6d98d9daaa341a8a6fb8b"/><file name="RSA.php" hash="579c11f7b2e05cae01b67b31461ca264"/><file name="Random.php" hash="6e86dfbd3f8f19f32f13a53a756e53af"/><file name="Rijndael.php" hash="3a0aa237cbc23ffba12aad6dd5215ab8"/><file name="TripleDES.php" hash="db12eebd6ed7290e4ac0d521ab5c55ce"/></dir><dir name="Math"><file name="BigInteger.php" hash="8dd950e566864b28c92b58acb06e1535"/></dir><dir name="Net"><file name="SFTP.php" hash="4665bea6e721ec016e0e70207cf45339"/><file name="SSH1.php" hash="19155c50cf00370152905b2a4a6ce657"/><file name="SSH2.php" hash="65563b38d6e6df3e8ebc628cec86f86d"/></dir><dir name="PHP"><dir name="Compat"><dir name="Function"><file name="array_fill.php" hash="2c0a4268deed10ced9491155e2284a82"/><file name="bcpowmod.php" hash="37fc1de34085874a930eaa76888f0cb1"/><file name="str_split.php" hash="889ab2b0d90b0962ded2ee65f1bfbc37"/></dir></dir></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
-</package>
diff --git a/var/package/Lib_Varien-1.5.0.0.xml b/var/package/Lib_Varien-1.5.0.0.xml
deleted file mode 100644
index 2ba4312fb2..0000000000
--- a/var/package/Lib_Varien-1.5.0.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Lib_Varien</name>
-    <version>1.5.0.0</version>
-    <stability>stable</stability>
-    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Varien Library</summary>
-    <description>Varien Library</description>
-    <notes>1.5.0.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:01:02</time>
-    <contents><target name="magelib"><dir name="Varien"><file name="Autoload.php" hash="78ab4b97bbcca3c08de3619dd94550e6"/><dir name="Cache"><dir name="Backend"><file name="Database.php" hash="92cce0ccb39120a2baf732f3a5ab7fad"/><file name="Eaccelerator.php" hash="00bc01db2c4457fdad760835992ae2dc"/></dir><file name="Core.php" hash="018b7952a12633b8ec2a3d856d2b2c41"/></dir><dir name="Convert"><dir name="Action"><file name="Abstract.php" hash="3de0b3f423df89243793e3b474b9cbe8"/><file name="Interface.php" hash="fe9129227525ffc1f862c6f1f85e83f1"/></dir><file name="Action.php" hash="ee3a0baf50c1bb0f1c0b67721f1965e6"/><dir name="Adapter"><file name="Abstract.php" hash="0c53dc267b75e595518365ab8f1d8ab4"/><dir name="Db"><file name="Table.php" hash="d6b8a1bfe2de4ed908ca0367fb226d2c"/></dir><dir name="Http"><file name="Curl.php" hash="938f2e176d58f61e078329949d23a92e"/></dir><file name="Http.php" hash="afb44986f4d6ba1cf84819bbb31004b2"/><file name="Interface.php" hash="2c4834f37eede972be48c8b3a2857661"/><file name="Io.php" hash="a9ceb53b810de3e183b439ba1bb1ba57"/><file name="Soap.php" hash="4b67a9ea45b12dfffabd26d2cb8942f2"/><file name="Std.php" hash="225b4e11d9ffcd1db8f99d54dc749687"/><dir name="Zend"><file name="Cache.php" hash="845fcb65276b05714b8d231c6b30f651"/><file name="Db.php" hash="794cb6226590ff7d2a7d1fbce26fcc05"/></dir></dir><dir name="Container"><file name="Abstract.php" hash="8f836665d0dec3c7cc7d93714e9c99b4"/><file name="Collection.php" hash="b1ef8a70ea806deb351b5413d6cfacef"/><file name="Generic.php" hash="bef8559c7a10ecf3ebb3f147795a2597"/><file name="Interface.php" hash="870470de0ec947f1039aa415d37d0f82"/></dir><file name="Exception.php" hash="58c9437dd946d5251234f55de3648d3f"/><dir name="Mapper"><file name="Abstract.php" hash="e1d9d87a1270ad6a499549dd87f9ac62"/><file name="Column.php" hash="7f74158a73fd8fa83052625ef07b1749"/><file name="Interface.php" hash="d8a8b98cece9ae38302914bbc910c094"/></dir><dir name="Parser"><file name="Abstract.php" hash="3559203bdcdb019daddd9ed558f596a7"/><file name="Csv.php" hash="f68d8dc8c0695296cc32b1ca716a8276"/><file name="Interface.php" hash="016ab96988f7ae02d2e84ed4878513ca"/><file name="Serialize.php" hash="52a93cacd5f3d3e0267bbffc74d7d715"/><dir name="Xml"><file name="Excel.php" hash="a8b60288a1aa41de84394b5c040c4e4d"/></dir></dir><dir name="Profile"><file name="Abstract.php" hash="c038c0b7a209c7a189beb6aa21df617b"/><file name="Collection.php" hash="2ff1f76cafa7e36826063069efdba8ad"/></dir><file name="Profile.php" hash="9b63f8909ed29bf5a3c729bc5934cb9c"/><dir name="Validator"><file name="Abstract.php" hash="3fdf8a0fcd2366563e330c30456f19b9"/><file name="Column.php" hash="da9bb1ffa8d6026a6d26365da4cec289"/><file name="Dryrun.php" hash="70f63aa2f6146c67658dc7bfd04ddf02"/><file name="Interface.php" hash="59c7a5d323e0a3bb6928754f3f4393ad"/></dir></dir><file name="Convert.php" hash="441a61c66ee524a024c7ffe8b7c7c3c2"/><dir name="Crypt"><file name="Abstract.php" hash="73980e75bef5f58855ea924c3693522d"/><file name="Mcrypt.php" hash="3c62cbb2f8e763e0da985b7bc054c5c3"/></dir><file name="Crypt.php" hash="cb28cabbc8a02fd86705bc0b52d7204b"/><dir name="Data"><dir name="Collection"><file name="Db.php" hash="12166a9e1db4d7d10e2a6c481b23d179"/><file name="Filesystem.php" hash="4574312fc65b08180fdcdba4d0358940"/></dir><file name="Collection.php" hash="d502edefe99901d8ad742742be22a682"/><dir name="Form"><file name="Abstract.php" hash="dbdba6a1c6eb91821e3f2aece115ace9"/><dir name="Element"><file name="Abstract.php" hash="061e619960114ff0146a95627027a556"/><file name="Button.php" hash="98c64b5da29dff22cfae938caa5833c8"/><file name="Checkbox.php" hash="7992114fdc4aefafceebac2a08c1a434"/><file name="Checkboxes.php" hash="fdc32833161b60139e9859f387bce6c7"/><file name="Collection.php" hash="168ed3f51330df8e4078e40876f6eadb"/><file name="Column.php" hash="b6d1d32aca981ae0fd1c6a83fc655c9a"/><file name="Date.php" hash="3f5c8628e329cbc87c33c7e622a3b946"/><file name="Editor.php" hash="bc65c33829d788ba66af3bc5bfc1f493"/><file name="Fieldset.php" hash="f78031a222ad4263826adf2f35622c72"/><file name="File.php" hash="463e8c8e106fe2018fdbf117e330423e"/><file name="Gallery.php" hash="6cb83ebc8efae252978fbd22c001642b"/><file name="Hidden.php" hash="ae6275e5d3b7df411bfda4fb4f995a8c"/><file name="Image.php" hash="9cd7231a0e14dc569045cf5fbf0e5b7f"/><file name="Imagefile.php" hash="2d6ed40fef1c2927ab22dea7d29336db"/><file name="Label.php" hash="6759a3286fb2b126e998934af8d6ce17"/><file name="Link.php" hash="fb213bbbce4e46ea03a96923defbfbb3"/><file name="Multiline.php" hash="4079b98a41fbc63313834cc28c2942e0"/><file name="Multiselect.php" hash="eaeda0f4bdc8dc7f5166126638e1a766"/><file name="Note.php" hash="f5b71ebcf5a2b774393d9f4d1581dc35"/><file name="Obscure.php" hash="b61a077fbdea1b93be0aafc2f2c2f391"/><file name="Password.php" hash="a15263e7b0fabe8bd6abf8487f43efcb"/><file name="Radio.php" hash="4b32afab119091759d93ec99fb2fd53b"/><file name="Radios.php" hash="9004386a01f6c2b09435f39bf9b5bb36"/><dir name="Renderer"><file name="Interface.php" hash="61baa8c8755a9a7e8eaac5786ae38f42"/></dir><file name="Reset.php" hash="51bc11836e12bd64390476e3ff393c13"/><file name="Select.php" hash="4402f264e6e2cae5fbad26bc44aa21fe"/><file name="Submit.php" hash="5b9e9e3db9bc70757030312b7d002b7e"/><file name="Text.php" hash="2e798cfd096ac0a87f9d9055000af3c3"/><file name="Textarea.php" hash="b88d00399b8f6846d56055c9416dd0bb"/><file name="Time.php" hash="f35d8d1dc0a90dd6f044f17c22d8dc4a"/></dir><dir name="Filter"><file name="Date.php" hash="80eee9775448a21a5332f3e5cb7edcc9"/><file name="Escapehtml.php" hash="0c02fdfbae30158aa14f45b937332249"/><file name="Interface.php" hash="4542e15af14cc92d7bf5a863d4bf5ddd"/><file name="Striptags.php" hash="2c4cd0905e4e3b99ba373ffeb9ab7d38"/></dir></dir><file name="Form.php" hash="407eee6f100c7befa18ca586b3c3ae04"/><dir name="Tree"><file name="Db.php" hash="d06e9a49ddb1ea94892f4f10e1b3fea1"/><file name="Dbp.php" hash="768ff3f40f025af087b2247417328a06"/><dir name="Node"><file name="Collection.php" hash="941c88db98d69ec170674380fe3413d5"/></dir><file name="Node.php" hash="e985629bbea05cd0e52d7ac82fc2ee27"/></dir><file name="Tree.php" hash="e39d73757e0535493badc5bea8459834"/></dir><file name="Date.php" hash="b03b3a5a6b3af1e6c867cd316470db01"/><dir name="Db"><dir name="Adapter"><file name="Mysqli.php" hash="fd4cba8c6a5ac165c50976b93b3fc3d8"/><dir name="Pdo"><file name="Mysql.php" hash="d7fc8be5bcc767bb40a31d8e0f01b9fb"/></dir></dir><dir name="Ddl"><file name="Table.php" hash="395911ce48769538453a38e8999aa3d6"/></dir><file name="Exception.php" hash="93966b32e96f793f031244716ff37eed"/><file name="Select.php" hash="372931c621e4ac535aefc0f141e39a01"/><dir name="Tree"><file name="Exception.php" hash="6a00d12bbed94d648a974d213a816a4b"/><dir name="Node"><file name="Exception.php" hash="f890d0fc36e89aefd7cf04ae6c10a88e"/></dir><file name="Node.php" hash="6b048bbe2b2c46e405ffae8bca23e579"/><dir name="NodeSet"><file name="Exception.php" hash="2caa6a4b09846fe3b941563aa55d3c5f"/></dir><file name="NodeSet.php" hash="5e589b0c1221caf2693fe6f7d07e1ad3"/></dir><file name="Tree.php" hash="c7cc99ac052aa5d1ac721619d47506e6"/></dir><file name="Debug.php" hash="edd0fabca94882fcecdba9c6f5a25982"/><dir name="Directory"><file name="Collection.php" hash="59faf0b57bc10bdf3daade69b51fd142"/><file name="Factory.php" hash="112fda936935de43f45bf0e1b1ebfd23"/><file name="IFactory.php" hash="bb7a2578774f58922f7d5b3a90c34e3e"/><file name="a.txt" hash="026e450c46ac92ea375302955a4f42fb"/></dir><dir name="Event"><file name="Collection.php" hash="cb422c6c7abb160fa3d7d54669bf2b2e"/><dir name="Observer"><file name="Collection.php" hash="b9c7d52c9563a19d15723bbc4a85fac6"/><file name="Cron.php" hash="0e04e63cf24f5cce3031f5896c439b68"/><file name="Regex.php" hash="f97f5a4435d560e073d725681cb15264"/></dir><file name="Observer.php" hash="eff7b66ce01d3f8fc4c00d974a2d5440"/></dir><file name="Event.php" hash="1836bb96f191e616d59178f17e407277"/><file name="Exception.php" hash="6beb1561720cc6c7a894a955ff2251b7"/><dir name="File"><file name="Csv.php" hash="5736e17051a3e778c59b99ed669caee5"/><file name="CsvMulty.php" hash="af4518063d4d9f03cfbfca832c1b9d76"/><file name="Object.php" hash="35f378145c50c7efdd5982aa75e3a582"/><dir name="Transfer"><dir name="Adapter"><file name="Http.php" hash="c71dc1460cdcf062adb97b577e621923"/></dir></dir><dir name="Uploader"><file name="Image.php" hash="2655d6497c074c8c4998c58320d60c14"/></dir><file name="Uploader.php" hash="134e1b7d878f49133dbe6019ab8801a0"/></dir><dir name="Filter"><dir name="Array"><file name="Grid.php" hash="14bd2f5ab60e7255557fc2dff7f24a37"/></dir><file name="Array.php" hash="a38e3d26f47d1bfaf4e023662d9a3dad"/><file name="Email.php" hash="067f3ea6f1597ea2501455865977d789"/><file name="Money.php" hash="8bec682670cb4cbf48e4b4264e2ab188"/><dir name="Object"><file name="Grid.php" hash="e3c3fa92761e5a1e1401192d8362301e"/></dir><file name="Object.php" hash="5b85aaff354eb0770e14efcfebda263b"/><file name="Sprintf.php" hash="0dd85ddc3d4b737d7cc6308afc12db18"/><dir name="Template"><file name="Simple.php" hash="b342cd136c10a6630d2d7dccd4137387"/><dir name="Tokenizer"><file name="Abstract.php" hash="d737a3d6599939b2a12b55975c9af780"/><file name="Parameter.php" hash="140ab2548a3da859473a46c7b0d44504"/><file name="Variable.php" hash="4ba64c31b234db22c2ff1799a49e7798"/></dir></dir><file name="Template.php" hash="59612d4851769548308449114b6c122a"/></dir><dir name="Http"><dir name="Adapter"><file name="Curl.php" hash="4b74b0a2c86732d32a653794a3afc52f"/></dir><file name="Client.php" hash="eac22d5beaca06c1678c327a13e7f45d"/></dir><dir name="Image"><dir name="Adapter"><file name="Abstract.php" hash="0ac17ab0c82dea6289caf0985be0c47d"/><file name="Gd2.php" hash="acb2f1c63c27e4d93a594101ba813a2c"/></dir><file name="Adapter.php" hash="edbab0bcfa931ae1d8f813f467e6b311"/></dir><file name="Image.php" hash="af8523dec84cc1ea80f7a8fdfffd6f93"/><dir name="Io"><file name="Abstract.php" hash="53e7055dfe0ca7d133b94cfbf3621693"/><file name="Exception.php" hash="493365429caf5d2170c00137b081b195"/><file name="File.php" hash="2334c3704f33c0d3dcf03f4fcd0ceeb1"/><file name="Ftp.php" hash="f349b9b833133853c902abb493d4f3bd"/><file name="Interface.php" hash="0b26ea223a4bed00df9b7b808b2acf80"/><file name="Sftp.php" hash="461d458eb368ed01f3b9194bafc4030d"/></dir><dir name="Object"><file name="Cache.php" hash="a87d2ae2d015a4e2f2fc1b611feccfcd"/><file name="Mapper.php" hash="1180b9b29c366d886e8af05181aebbce"/></dir><file name="Object.php" hash="4f1f5be02d88e61362fcaed4ad188a28"/><dir name="Pear"><file name="Frontend.php" hash="61a9a308d54eca9e0a0bbc09296189f1"/><file name="Package.php" hash="a4261d73ebc059785fe418c6350bb4e5"/><file name="Registry.php" hash="5780af5995ea9af32032d3ebe496e251"/></dir><file name="Pear.php" hash="d60801531ef3ac16b26e302961310c53"/><file name="Profiler.php" hash="d434c08a6dd3ef8eb168e3a3d46f057f"/><dir name="Simplexml"><dir name="Config"><dir name="Cache"><file name="Abstract.php" hash="6dbbd6f1bc63c1b7ee086399da30f4e0"/><file name="File.php" hash="f99292ec6d04d5464a1313a2c52880d4"/></dir></dir><file name="Config.php" hash="a957b7feccdf430239af81610a6ac281"/><file name="Element.php" hash="f8321180f2b343080ffd89591943b239"/></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Lib_ZF</name><channel>community</channel><min>1.11.1</min><max>1.12.0</max></package><extension><name>PDO</name><min></min><max></max></extension><extension><name>SPL</name><min></min><max></max></extension><extension><name>curl</name><min></min><max></max></extension><extension><name>SimpleXML</name><min></min><max></max></extension><extension><name>dom</name><min></min><max></max></extension><extension><name>gd</name><min></min><max></max></extension><extension><name>iconv</name><min></min><max></max></extension><extension><name>pdo_mysql</name><min></min><max></max></extension><extension><name>mcrypt</name><min></min><max></max></extension><extension><name>pcre</name><min></min><max></max></extension><extension><name>Reflection</name><min></min><max></max></extension><extension><name>session</name><min></min><max></max></extension></required></dependencies>
-</package>
diff --git a/var/package/Lib_ZF-1.11.1.0.xml b/var/package/Lib_ZF-1.11.1.0.xml
deleted file mode 100644
index 94875e56b5..0000000000
--- a/var/package/Lib_ZF-1.11.1.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Lib_ZF</name>
-    <version>1.11.1.0</version>
-    <stability>stable</stability>
-    <license uri="http://framework.zend.com/license/new-bsd">New BSD</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Zend Framework</summary>
-    <description>Zend Framework</description>
-    <notes>1.11.1.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:01:03</time>
-    <contents><target name="magelib"><dir name="Zend"><dir name="Acl"><dir name="Assert"><file name="Interface.php" hash="3a493bea9ddc17be56d59c59d15bef95"/></dir><file name="Exception.php" hash="611232c09f638d8bda37bb0dd146dc80"/><dir name="Resource"><file name="Interface.php" hash="755f7b2a1582112d95761ff1323411dd"/></dir><file name="Resource.php" hash="a5bad0989a4ad147b0410e9d78198e77"/><dir name="Role"><file name="Interface.php" hash="1408162f81475415565476f72bfca5b5"/><dir name="Registry"><file name="Exception.php" hash="853ed42bebbf8e8af7ad498061ca7c04"/></dir><file name="Registry.php" hash="013f671a0758d7d672976ade87f5f79e"/></dir><file name="Role.php" hash="bf99fd9fedc82fc24db26cdbd031e935"/></dir><file name="Acl.php" hash="99e1c983a462f7fa5e5dd0f5e3fee6ad"/><dir name="Amf"><dir name="Adobe"><file name="Auth.php" hash="a0a89025a14ee198a2609e0ead9b1df7"/><file name="DbInspector.php" hash="683e78b6144d0ff2476f016676e4cd80"/><file name="Introspector.php" hash="62fbf6c0171290e926568963bee79780"/></dir><dir name="Auth"><file name="Abstract.php" hash="4ef9b29837e541d282d2c97296b0c2f2"/></dir><file name="Constants.php" hash="2b460fb491078abf97f5791770bda21b"/><file name="Exception.php" hash="62a54c5bb24517c8a1d026767036c9be"/><dir name="Parse"><dir name="Amf0"><file name="Deserializer.php" hash="b1492fdd4af22b69dbea11e4df5798de"/><file name="Serializer.php" hash="51339f6c373091d499ab1ea5a6f833d1"/></dir><dir name="Amf3"><file name="Deserializer.php" hash="4a5a922bfa1e55a94a94089693af4a8d"/><file name="Serializer.php" hash="0b7e2d912856576859f897986f49d411"/></dir><file name="Deserializer.php" hash="8616214649b5689ea59939ccf9a4121c"/><file name="InputStream.php" hash="03b699a94aef35a8dd50bd79aa2a5b47"/><file name="OutputStream.php" hash="25fd9616f5e8194d51c34e66a74d4f4b"/><dir name="Resource"><file name="MysqlResult.php" hash="b238bf15921d5fd1602b3b8c8cdcd6d5"/><file name="MysqliResult.php" hash="94c21a6853d580487cd1372f46f5c090"/><file name="Stream.php" hash="4d444bb5ab2b1de2b86de1f016c2bf99"/></dir><file name="Serializer.php" hash="7744df704faf573198f9b07b9028da01"/><file name="TypeLoader.php" hash="ea0f4e063d9024b40cc658e22b88d364"/></dir><dir name="Request"><file name="Http.php" hash="120bfa48a5086bf157f1d5594b0f6f59"/></dir><file name="Request.php" hash="6b04136d80df3859019a0e6bda6dffa2"/><dir name="Response"><file name="Http.php" hash="a7d06e1ee27db7ee9c9978785ef44178"/></dir><file name="Response.php" hash="8eca6c88c3c279e54a34ee903511e269"/><dir name="Server"><file name="Exception.php" hash="5eb32e0be6eb21f9458fe2cc758e6e3b"/></dir><file name="Server.php" hash="9afc96bc31f7a03f0da3926b8728fc0a"/><dir name="Util"><file name="BinaryStream.php" hash="fa56816139a349254e4a91e9f8e390ca"/></dir><dir name="Value"><file name="ByteArray.php" hash="ad402815ed3ede54a2967266153ac3cb"/><file name="MessageBody.php" hash="a8d4466dd759a8b19030d8759941f08b"/><file name="MessageHeader.php" hash="ac2f19556d1530a0bd88f6a7a020d7d5"/><dir name="Messaging"><file name="AbstractMessage.php" hash="ead070f1a65564b2f06df9b11845ddf6"/><file name="AcknowledgeMessage.php" hash="fa67704d0ce4e28eb20f8231054aeb69"/><file name="ArrayCollection.php" hash="bf5ae50ce539fea1c56022c913b1320d"/><file name="AsyncMessage.php" hash="548eaed334f78a0e1f0c65b9c24191e7"/><file name="CommandMessage.php" hash="f4e26fb47f7998de441cb096467a1e1f"/><file name="ErrorMessage.php" hash="ab13abcf9b90a33355adb0a2547428dc"/><file name="RemotingMessage.php" hash="5ac81504d33e923830807bc3f065e389"/></dir><file name="TraitsInfo.php" hash="3c695cdd523ba60aed7de400ec23339b"/></dir></dir><dir name="Application"><dir name="Bootstrap"><file name="Bootstrap.php" hash="8ca87a075db2eb3188b371f354270fcc"/><file name="BootstrapAbstract.php" hash="0e4c758453090e31d4f1dfc1b107b982"/><file name="Bootstrapper.php" hash="e6f8453619228969eb9bd698390bc91a"/><file name="Exception.php" hash="70d2f11478b3e3ffe9a5f8b74c636d23"/><file name="ResourceBootstrapper.php" hash="a186fdb4fa6a0b0312d6db97d7edaa0e"/></dir><file name="Exception.php" hash="46bd2ef5c7706c71c09f9826cceed3a2"/><dir name="Module"><file name="Autoloader.php" hash="3ba1d5a5413826bd774858a1e75bdf27"/><file name="Bootstrap.php" hash="20c52f99c2a9c6bd8e46276bbfbae97f"/></dir><dir name="Resource"><file name="Cachemanager.php" hash="9f3e8ba81eb52655882d704f660ffb18"/><file name="Db.php" hash="75dc9b7acaeae19f663c370b772bb1c5"/><file name="Dojo.php" hash="fd33ee3825656a741330167952c28a44"/><file name="Exception.php" hash="fb0a9d96c38b1c73f2963bec0936d6e7"/><file name="Frontcontroller.php" hash="4c1d7ee4b28025509e9bfd56e51d9955"/><file name="Layout.php" hash="79b868be8e52bcb4b5db807c6826c369"/><file name="Locale.php" hash="b6cd8fb6e9479a14ed80619d82ffa546"/><file name="Log.php" hash="dc5ccbe68fc8385dd2ab58ea80132412"/><file name="Mail.php" hash="6565a7c6be5986e4303801fae6cc5962"/><file name="Modules.php" hash="da5d7731a1ca7e09442d237641fa3b2e"/><file name="Multidb.php" hash="75441a4fc426a8588ce40d14388c9a6c"/><file name="Navigation.php" hash="7cb8fc2d251519e8305bf458d15db066"/><file name="Resource.php" hash="b45e47581f8cac1f8fa7cfe30957f329"/><file name="ResourceAbstract.php" hash="4644215266d27dc1b68a24b92ebb9798"/><file name="Router.php" hash="6206fb704552885d5d2307577693df9f"/><file name="Session.php" hash="825018a6d3183cb830cb21dc25b82385"/><file name="Translate.php" hash="7eb82701e18a9e306d547c1b812243b8"/><file name="Useragent.php" hash="e5286e8944b0e8f54b539655975c2cb7"/><file name="View.php" hash="62e4a6a09ee4bef2cab611661b62c0c6"/></dir></dir><file name="Application.php" hash="c465acd7f766282c7b287d6299ed1865"/><dir name="Auth"><dir name="Adapter"><file name="DbTable.php" hash="3c559fbab141c2c26757f09842f87a66"/><file name="Digest.php" hash="af650900517ae5b7bcbc18bd23eeb0e5"/><file name="Exception.php" hash="76385cfe5c8f138465a1ed95a303c01f"/><dir name="Http"><dir name="Resolver"><file name="Exception.php" hash="cb0e02c45393a116190d966e00630f90"/><file name="File.php" hash="fb0b48284e86d3354310d51a437a109a"/><file name="Interface.php" hash="e17526a33c60541acc690e0da610f542"/></dir></dir><file name="Http.php" hash="8520b7be3cb6d305113373e1d2da6fc3"/><file name="InfoCard.php" hash="02651004c2b07a4791a10b15ec4c6c2d"/><file name="Interface.php" hash="4cd7d67057d848cad44f3c690ccf03e4"/><file name="Ldap.php" hash="9269f063c4480e8ae9babddb8517c624"/><file name="OpenId.php" hash="2e7c928cf23fd15c8bb1360d9de48b9c"/></dir><file name="Exception.php" hash="7b05916c9f218f24cd876548e9ddc4cc"/><file name="Result.php" hash="74fa4ed17032e512afc9c32613fe6b19"/><dir name="Storage"><file name="Exception.php" hash="56001e95d7d02474c5e64517200a1d31"/><file name="Interface.php" hash="43b16a17421a66eba0b6e648b7445452"/><file name="NonPersistent.php" hash="85459a5ee2a800621a5fd8bca63cb24b"/><file name="Session.php" hash="93dad7e06bd689f1bd122bdff52a7cd7"/></dir></dir><file name="Auth.php" hash="1d96f074dc6862b9a22657a132db12bc"/><dir name="Barcode"><file name="Exception.php" hash="2a090a4379ccfc1b9eca04163be8a2c8"/><dir name="Object"><file name="Code128.php" hash="6975afd7cd565df23e14ee69d952fa33"/><file name="Code25.php" hash="df88543c78ab4e127bd9270c97140de4"/><file name="Code25interleaved.php" hash="6cad750c405595402b2dbe390540ec08"/><file name="Code39.php" hash="a35036cf8dc98bb3605ece344d77d388"/><file name="Ean13.php" hash="4cd019f3881a3d35db2034f7a1c6d0aa"/><file name="Ean2.php" hash="890bf5d1de3926edda6028d1b9214a5e"/><file name="Ean5.php" hash="c5b684d4a9192f93ba19ce1faeb8add3"/><file name="Ean8.php" hash="738ba7fbc838fe0f3b59cce5f92fa692"/><file name="Error.php" hash="63eb9695c142e293807e15d24af44d7f"/><file name="Exception.php" hash="d72e659ab79efce010f5aea26319e757"/><file name="Identcode.php" hash="27bea3a1a3f8c5e5d22cab57ae2636c6"/><file name="Itf14.php" hash="f205c18ce7343219ff740b326046905e"/><file name="Leitcode.php" hash="ecb3104f185b8ef8c8537885830a759a"/><file name="ObjectAbstract.php" hash="bc5052d94323fb6b8272dc612a567bcc"/><file name="Planet.php" hash="30002087cbd070bfe27fed5ac4ecf768"/><file name="Postnet.php" hash="16fbf5e9f2d43f0519d5deec97f7b289"/><file name="Royalmail.php" hash="2edbb5f5eeb994272696343e3b058b8b"/><file name="Upca.php" hash="8ce0453198e785764d220b25d93fc9f5"/><file name="Upce.php" hash="094abec66d5fabc132ec66fbe20d45ab"/></dir><dir name="Renderer"><file name="Exception.php" hash="5d04566e7855d744d3f8d11638ab9093"/><file name="Image.php" hash="59461ff31a407269307ee1a2830f8eaf"/><file name="Pdf.php" hash="a769ef7eb876e762c78f1f82c466b2a5"/><file name="RendererAbstract.php" hash="7d9b20a20238b46dbb9f39a0406d7598"/><file name="Svg.php" hash="f343fcfe2ae96bc3805913bbe09addf6"/></dir></dir><file name="Barcode.php" hash="f260b9ed7ca312ed48d84268c299c273"/><dir name="Cache"><dir name="Backend"><file name="Apc.php" hash="52d21b1a741b39a3a0761334e951304e"/><file name="BlackHole.php" hash="e69a32bae68cb75f03aa1e57b92915ca"/><file name="ExtendedInterface.php" hash="1e71dcd3f3515dbf25c784347048636f"/><file name="File.php" hash="3955047c8f1230d18534687f03047ac4"/><file name="Interface.php" hash="c10046d2506da12af31f3fea27dfd77a"/><file name="Libmemcached.php" hash="1ca06897f50480536769ce74b3baabcf"/><file name="Memcached.php" hash="87d1cb7a40a304f5cf824bdbb8cb7c9d"/><file name="Sqlite.php" hash="97eff0b38fb3fe522d626b93409dccd1"/><file name="Static.php" hash="d02e3e3f87ecc4a475a7c188dffa0ce4"/><file name="Test.php" hash="d6779196d39f5d0b4070ce708d06e7a2"/><file name="TwoLevels.php" hash="e7b1a93d283e979151b05b40b0ba76af"/><file name="Xcache.php" hash="ec89c1bac0d7621a2074bbfc90476d63"/><file name="ZendPlatform.php" hash="93db9eb19a6580bea159fd21dff5e062"/><dir name="ZendServer"><file name="Disk.php" hash="bf208754990f9ed033012ca9d4e09693"/><file name="ShMem.php" hash="5c56c87c58abe87e7a8c01bbf035954e"/></dir><file name="ZendServer.php" hash="5826ed0aa7341c8e19f2fa069a770d55"/></dir><file name="Backend.php" hash="4370d88090db022e89a7c9f0710a611c"/><file name="Core.php" hash="e58cb1ddbee984dda04b308779801636"/><file name="Exception.php" hash="ccd6284978f001e10342800c04cac10b"/><dir name="Frontend"><file name="Capture.php" hash="e624882aa10cab4792bfefd0340046bb"/><file name="Class.php" hash="9b3504155a590813358ee21d84437568"/><file name="File.php" hash="135f8c99219f18a60baa83198204264b"/><file name="Function.php" hash="60a4016cbac2bafe18ccdb2875b17d66"/><file name="Output.php" hash="74af8ad6f28917fe4dd1855fc0a498ff"/><file name="Page.php" hash="8459f891f0996e4b82306e6bd0650a2a"/></dir><file name="Manager.php" hash="04b3de0863bc26360f56bdbb0757df1e"/></dir><file name="Cache.php" hash="2f3cccc5ce76fae3df6825efe9ee0ea6"/><dir name="Captcha"><file name="Adapter.php" hash="407b65618f8b6cc787808aa2e3526ad7"/><file name="Base.php" hash="8863ec31a7c486ed5c25019f042ef705"/><file name="Dumb.php" hash="664aa2ff6e88671aa8dccd08c67f3a00"/><file name="Exception.php" hash="b5ec2859b351f7b1b311616165be0928"/><file name="Figlet.php" hash="cd6bab79b5dfbe2acc40bd16bde0a40a"/><file name="Image.php" hash="bb0cc89158137329411971143cb2f832"/><file name="ReCaptcha.php" hash="bf5b83cf9312344da17460bbe796ad38"/><file name="Word.php" hash="e9b6f94883c0ea912056734a00ee9e58"/></dir><dir name="Cloud"><file name="AbstractFactory.php" hash="8a850efa4730a59121cb48e2ae420810"/><dir name="DocumentService"><dir name="Adapter"><file name="AbstractAdapter.php" hash="32e27e4a86c908ccdd0a2f50e361624a"/><dir name="SimpleDb"><file name="Query.php" hash="1574247460cb96af6e32ae3455266862"/></dir><file name="SimpleDb.php" hash="4b13a62bd86ab6a181d7fef032c89222"/><dir name="WindowsAzure"><file name="Query.php" hash="5539a3aa3e0c0028797fd332ee126f30"/></dir><file name="WindowsAzure.php" hash="57b37c4f27c621cb310ed2993a65c041"/></dir><file name="Adapter.php" hash="518befebac3e81866094c9eab9873954"/><file name="Document.php" hash="553e8d953fac08b826ed479ebcdd08c7"/><file name="DocumentSet.php" hash="f93757623e16315b422d44d76a22a0a0"/><file name="Exception.php" hash="970039dfc7c253199f6178cb0a0cc76e"/><file name="Factory.php" hash="5050b82c5891afe034ad5b8b465d3366"/><file name="Query.php" hash="27cfde145c1524b80d212344536e35ce"/><file name="QueryAdapter.php" hash="beec8c04ac8500cd55a0232c69b3f61b"/></dir><file name="Exception.php" hash="0c165b65f3ecf6872782c7bd93446ba0"/><file name="OperationNotAvailableException.php" hash="036be944c0423a3d27bb1830bad9561e"/><dir name="QueueService"><dir name="Adapter"><file name="AbstractAdapter.php" hash="ee107833dc5d1d1b4eae003eec819837"/><file name="Sqs.php" hash="61d48488b9f94e52d169de7567c8de05"/><file name="WindowsAzure.php" hash="ea49bea7a1b73ec9fa72232b1dfd9f3e"/><file name="ZendQueue.php" hash="facde0281c3e217e5c0771b7a74b86b2"/></dir><file name="Adapter.php" hash="e0e8ab69bf8eb1eb11d5dfb9ed20fbd0"/><file name="Exception.php" hash="2285e5bf25838db90ed1360ed8759ad3"/><file name="Factory.php" hash="2890329b412a9daba4179aa809ceadf4"/><file name="Message.php" hash="f660bf36070c35e83e8622161c3b5647"/><file name="MessageSet.php" hash="b9e008319bf07b3aede8c2baa43608f8"/></dir><dir name="StorageService"><dir name="Adapter"><file name="FileSystem.php" hash="a6dc7a5f00c0a0692c5a2c225ca79897"/><file name="Nirvanix.php" hash="9c4bfd70fac30ae3ce5f81e94906fe24"/><file name="S3.php" hash="f48730a872e7d726bc30ee7123bf19ea"/><file name="WindowsAzure.php" hash="2e447322f04376d98dd5ecb188ce85f3"/></dir><file name="Adapter.php" hash="6ab63d9824a183f223d4941d4a0f8de1"/><file name="Exception.php" hash="47f6db67614def587a3dc5c206474613"/><file name="Factory.php" hash="e74ce4a530ced8da1923840e7a807483"/></dir></dir><dir name="CodeGenerator"><file name="Abstract.php" hash="2c2ca62cc857c7db50a4dcae8866b65a"/><file name="Exception.php" hash="cf9d61ad13d9abca940f736478efdce8"/><dir name="Php"><file name="Abstract.php" hash="a8b3778a34590f5083c6b0ff21e56000"/><file name="Body.php" hash="8117907c61c01392f8752addba61d9b6"/><file name="Class.php" hash="77c301343d960f880b4eb8128b2585e7"/><dir name="Docblock"><dir name="Tag"><file name="License.php" hash="0fa31fcfc89dc893db06495be423fc35"/><file name="Param.php" hash="11050062f04cd09252ee9fa289b2bdd5"/><file name="Return.php" hash="fcf458a213187a2b4adfa9a3aa948b86"/></dir><file name="Tag.php" hash="db0f7e512ce5759ec9d6eeae136f5bcc"/></dir><file name="Docblock.php" hash="8eb0a1420797687b64e3ed79dc896eef"/><file name="Exception.php" hash="8998515c3e91f83c645026a844903744"/><file name="File.php" hash="bf043b63a34d9262fcce0c081615d876"/><dir name="Member"><file name="Abstract.php" hash="f94c3bfc27fa2c809f37e326e1128a9d"/><file name="Container.php" hash="e7d25459118cc3cc454b2eb0678a14dc"/></dir><file name="Method.php" hash="290edcbe075243611289ddf355569af0"/><dir name="Parameter"><file name="DefaultValue.php" hash="01dd32490f7402c7ac55bb3a727b0ea4"/></dir><file name="Parameter.php" hash="77a3e8993760f7e17bea3f299f9c8f86"/><dir name="Property"><file name="DefaultValue.php" hash="37a1d34a6b2772a49a75d4ff8782a8e2"/></dir><file name="Property.php" hash="487ecf8f85dc6628fe07098a8082fb17"/></dir></dir><dir name="Config"><file name="Exception.php" hash="dac732a7af60629994e46957c8af92ce"/><file name="Ini.php" hash="5025f6f73ba30fe11af5613bf112fa2b"/><file name="Json.php" hash="64edd2a73c1b98b9f3b0b91ff97fbd73"/><dir name="Writer"><file name="Array.php" hash="23d8b17a4c2facf7a1a9395303963ea6"/><file name="FileAbstract.php" hash="2dccb2b3f3fd33091d6ef155766b0846"/><file name="Ini.php" hash="5a71cf1f4e59f181840892ee70da2f9f"/><file name="Json.php" hash="1bd73356f20382d6bd5b4eda49a3a199"/><file name="Xml.php" hash="ce4fd74901e7e64bc25052d8e7eae22b"/><file name="Yaml.php" hash="35d4970c4e292eed7ae22d474892f004"/></dir><file name="Writer.php" hash="927464d61ee0163aad93b2244a86e88c"/><file name="Xml.php" hash="be8de39c2fd7dd053b7ee61ae37801f4"/><file name="Yaml.php" hash="cddb33cd936e6de3dcf1bd31bc85994e"/></dir><file name="Config.php" hash="59f3d790f8fe67282d3672b21675db5c"/><dir name="Console"><dir name="Getopt"><file name="Exception.php" hash="23b998b2d631256cbbb9e025b315007a"/></dir><file name="Getopt.php" hash="57d9c1f807b9dbab601aeedc08901bfe"/></dir><dir name="Controller"><dir name="Action"><file name="Exception.php" hash="fcc5da77ec7762e8f43c938d306efd3d"/><dir name="Helper"><file name="Abstract.php" hash="5fc19b56fa412966e3235b71c5b55bf2"/><file name="ActionStack.php" hash="ff5bb2eab47ea58405b38f4e04259e96"/><file name="AjaxContext.php" hash="ca4b5b03ab82fc91d2ae6b36c0087533"/><dir name="AutoComplete"><file name="Abstract.php" hash="3d45120dc19a7004462317f718149755"/></dir><file name="AutoCompleteDojo.php" hash="c376841d6b64a7e576e40f2ba6e1523f"/><file name="AutoCompleteScriptaculous.php" hash="9f9cffed4cbeddec8fa9b832306eb9f6"/><file name="Cache.php" hash="3ccecc0c5dca8b8cee17d50c56d8c19a"/><file name="ContextSwitch.php" hash="ccc4521554598f41a95b4081b4a77fe5"/><file name="FlashMessenger.php" hash="a595b3190ba4a19cda24f6487ca185de"/><file name="Json.php" hash="3a043a69b9b47c4c3789ef1f5acdc56c"/><file name="Redirector.php" hash="bbd77fb38a4ec89d8140cbaf560b1544"/><file name="Url.php" hash="0e29bd9039a0a2444f366c239a26ab1c"/><file name="ViewRenderer.php" hash="f90059dfe5b79f20962474590433d54c"/></dir><dir name="HelperBroker"><file name="PriorityStack.php" hash="9f2a0297b899cbf722b2ee8decde678d"/></dir><file name="HelperBroker.php" hash="91d6fedf63763e96ba745125bdc05eea"/><file name="Interface.php" hash="66e6369cc06cd7a006bd4c541a611201"/></dir><file name="Action.php" hash="5b147cc0e71783f17626fa078a3fb110"/><dir name="Dispatcher"><file name="Abstract.php" hash="570fe03a5c6bef468ce570678f1cb26d"/><file name="Exception.php" hash="4de350b637b547b3ef46dff29cdfc3ac"/><file name="Interface.php" hash="7c456298a06d4071213f207d1b608cbe"/><file name="Standard.php" hash="e964760bfa9c6ee2e18a62931bfd0033"/></dir><file name="Exception.php" hash="001e5e4390d449e5759f9486040b921d"/><file name="Front.php" hash="86672cd0708a8d76c43d0f117f8a6eeb"/><dir name="Plugin"><file name="Abstract.php" hash="170bbabec0aadbb79cc724f9604f9fd8"/><file name="ActionStack.php" hash="aa7b6c77d30c132d44af189bf3236d32"/><file name="Broker.php" hash="803b2edeee225230ab83aba6dee622b7"/><file name="ErrorHandler.php" hash="5a53d573b3a988b9441c2d8f86604d8e"/><file name="PutHandler.php" hash="ae92d5c71c79144fdf5c3f6d23ef3b67"/></dir><dir name="Request"><file name="Abstract.php" hash="4f766314dd46980b6a579bd318cccb3c"/><file name="Apache404.php" hash="55afde9c0c3e6fa37ffe8dfbfba4a34b"/><file name="Exception.php" hash="7fa1f8765a9eb7f66c6ddb1af1279064"/><file name="Http.php" hash="fdb043566ac6ae20255af138e510c8a4"/><file name="HttpTestCase.php" hash="598be9d5cf6ab33f7ad10fa28b5d96bb"/><file name="Simple.php" hash="96ed9ce6e62e457b4d4d1cc79c107742"/></dir><dir name="Response"><file name="Abstract.php" hash="e5fb9423c157cf66ae47f95d560eb820"/><file name="Cli.php" hash="05d8e61a59145be90dbefe241c8ea317"/><file name="Exception.php" hash="808ecc5de9760d9f924f9af2bfe59e42"/><file name="Http.php" hash="5b14495f635edc91ea4cfd90a9cfc230"/><file name="HttpTestCase.php" hash="8fcae7b3962c4ab20eff2526c325e2e0"/></dir><dir name="Router"><file name="Abstract.php" hash="0658e9fd9a3fbf19d33456ae72ce010c"/><file name="Exception.php" hash="3efafbc8de1302c3c9ef41b71300bcac"/><file name="Interface.php" hash="66b8dab25fdb5467686f18f70c6e9503"/><file name="Rewrite.php" hash="82b281741c63d3c8989b0660a97d921d"/><dir name="Route"><file name="Abstract.php" hash="c7647992ce0e4688d4b91f0d1b18718d"/><file name="Chain.php" hash="960542b577827f45596b3b7c9e463586"/><file name="Hostname.php" hash="b53b6b909f162c9f3f7994cfe10c8b72"/><file name="Interface.php" hash="8579e9a04b73eca50da1cb353037e607"/><file name="Module.php" hash="349d652c06bccd1bf21e6727cce9fd2d"/><file name="Regex.php" hash="df744748b7634dfc2386915472db15cc"/><file name="Static.php" hash="b77ccf5640821e4e5de5dd260927fec9"/></dir><file name="Route.php" hash="87c7a3a2563fbb504c7afef1facf1884"/></dir></dir><dir name="Crypt"><dir name="DiffieHellman"><file name="Exception.php" hash="791256e63bb9072ff410a2e4697d7ca9"/></dir><file name="DiffieHellman.php" hash="3942126272cc3548dd4fe0a3e3996183"/><file name="Exception.php" hash="958b87dc5476f55a3e06f899dc32850d"/><dir name="Hmac"><file name="Exception.php" hash="4dc357debd34961167503f391bf249b9"/></dir><file name="Hmac.php" hash="c48151d0b4d2aeddfd44bf1b03c2a05a"/><dir name="Math"><dir name="BigInteger"><file name="Bcmath.php" hash="d088e6a2aa83a70a33d40c66449d0f19"/><file name="Exception.php" hash="0dc6b51fb2d98628e29f698ed002b202"/><file name="Gmp.php" hash="3cfb06677feefc9301f2c3f3a169bed5"/><file name="Interface.php" hash="aed4d9a443d8f0d7a65fe0ccad078190"/></dir><file name="BigInteger.php" hash="74b341748aa5b92f007c66dd5e74beea"/><file name="Exception.php" hash="4ba027c5adef0cadbdcdf1ae4c23bc9a"/></dir><file name="Math.php" hash="2fae6e2187e862a83c821284c5a03eac"/><dir name="Rsa"><file name="Exception.php" hash="81eb3e2b74c2f9c3fefb542e82649f20"/><dir name="Key"><file name="Private.php" hash="e1d2fc11ef73fa105f4b1fd86880131b"/><file name="Public.php" hash="7be298fe572a2fa96d4ae03af2fab337"/></dir><file name="Key.php" hash="f28b954819da3a1a6389e775adb4b073"/></dir><file name="Rsa.php" hash="59e386d6d1102eaad3e7fa8c045805d4"/></dir><file name="Crypt.php" hash="b40283d31993e036cbfc5d9f60c7a622"/><dir name="Currency"><file name="CurrencyInterface.php" hash="20760a6269de07de040d4cb9099eb7f7"/><file name="Exception.php" hash="72800311a09805e865f4c455d1dda63a"/></dir><file name="Currency.php" hash="9b2c9bb060dbe057c32b5440e05edafc"/><dir name="Date"><file name="Cities.php" hash="96aacbccde693862db4982e2ece48d55"/><file name="DateObject.php" hash="171373eaf27558fb435368f80a09b1be"/><file name="Exception.php" hash="138b726e6bfce02da0b61f3ab10ded4f"/></dir><file name="Date.php" hash="a6bbf535dc9ebfd369af332198cdd233"/><dir name="Db"><dir name="Adapter"><file name="Abstract.php" hash="32465506a594a680faf91efbaca01e92"/><dir name="Db2"><file name="Exception.php" hash="0020623cd4a16419c975a9bd20b7e702"/></dir><file name="Db2.php" hash="0c9cbf93d4d1f5d40d95e066a48553ec"/><file name="Exception.php" hash="0f84ea78f9e5ee9b6aa87e5f974edbd3"/><dir name="Mysqli"><file name="Exception.php" hash="0a02c1cf18963bdc8b59537805da566b"/></dir><file name="Mysqli.php" hash="f05789be48e77b9b78c02482f7fd735e"/><dir name="Oracle"><file name="Exception.php" hash="21fa23a176548aebd89db6d23e0efec8"/></dir><file name="Oracle.php" hash="498f34c21d21d33d544a88fb688a2484"/><dir name="Pdo"><file name="Abstract.php" hash="d426d44f7fed4bd946768c23547b38c6"/><dir name="Ibm"><file name="Db2.php" hash="b14d58e164fa82ab19806d02402345a5"/><file name="Ids.php" hash="75a9f2ad5e380883522e11850f3d56bd"/></dir><file name="Ibm.php" hash="d7e6164504b98e6ffd0aa2541bbb4ab1"/><file name="Mssql.php" hash="b04709e8acb1db2728952c9ae8bc4339"/><file name="Mysql.php" hash="d6ae57138848a538d21e4723e10b3e57"/><file name="Oci.php" hash="2946adab74ac60affd22de48851b12ab"/><file name="Pgsql.php" hash="4f98711cb5fce4d43d05ed1b2ea9b23d"/><file name="Sqlite.php" hash="0d0e885eb7a9b047ff20e49e4df68c7c"/></dir><dir name="Sqlsrv"><file name="Exception.php" hash="5efb528a2801bfa355750447dd32abba"/></dir><file name="Sqlsrv.php" hash="5d3e00bf3a6ae39fd703905962226fbd"/></dir><file name="Exception.php" hash="f2fb01c49b27b95c6c223e54825f3623"/><file name="Expr.php" hash="f4a7fe0245bafd58ce75e06cec23ad4f"/><dir name="Profiler"><file name="Exception.php" hash="11335765326cb4b3517d61c445a5c1b1"/><file name="Firebug.php" hash="4f0d1038eefd51377e3d307005a9097f"/><file name="Query.php" hash="3b3948c81939587e252a3174d49303e4"/></dir><file name="Profiler.php" hash="69ff2b97f420be74c9423211bfe39e7a"/><dir name="Select"><file name="Exception.php" hash="845ae4762ac0602b88f727a30d4402ee"/></dir><file name="Select.php" hash="7060cba80236d7ad77474e344cbc00c8"/><dir name="Statement"><dir name="Db2"><file name="Exception.php" hash="1410478a37e2fabb68dd26b90f825d75"/></dir><file name="Db2.php" hash="97136fadc6572147e1e36d454fd1ab3a"/><file name="Exception.php" hash="0a5ad315d9ac9ae91ace01ed36d38dba"/><file name="Interface.php" hash="86323575d37ea81a1771139413c6e1f1"/><dir name="Mysqli"><file name="Exception.php" hash="7a3c1430a733083b1e5b34840d9e6823"/></dir><file name="Mysqli.php" hash="407068ce8aba4dcaf72c8c1a5f32d98d"/><dir name="Oracle"><file name="Exception.php" hash="fbe8b191d50346de9213a266d7e89489"/></dir><file name="Oracle.php" hash="2d8e9048c45b67614c610629478d91af"/><dir name="Pdo"><file name="Ibm.php" hash="1dd79fb4da4fe36eb419a1e17a50e747"/><file name="Oci.php" hash="2d761ecccfb52d6c47d1f89bc27b3457"/></dir><file name="Pdo.php" hash="cc8395153d9573d1823e5b07c009a3fa"/><dir name="Sqlsrv"><file name="Exception.php" hash="6bb3ccbb00d4f8045753a5767562737e"/></dir><file name="Sqlsrv.php" hash="342dd3389a832ff262b6ac1958cd255f"/></dir><file name="Statement.php" hash="b68e7161c42d65483d026380ac9233f3"/><dir name="Table"><file name="Abstract.php" hash="3df14d6a0fcede3610f16cf275471516"/><file name="Definition.php" hash="b25a10d9dea29b6c4f8fe6ce2849c178"/><file name="Exception.php" hash="0d8e0b1d9712589a21c6ef9338367589"/><dir name="Row"><file name="Abstract.php" hash="6b68b9c14932f90b1615d0d3bb58375f"/><file name="Exception.php" hash="42f0cb7d8dc64760686f7f0be2f3c465"/></dir><file name="Row.php" hash="106addf91221e643b02259e50f85d131"/><dir name="Rowset"><file name="Abstract.php" hash="ae7a90f2779634a662f04ceed53480d5"/><file name="Exception.php" hash="31be7b38c48c0a6931aa6e6e96afe642"/></dir><file name="Rowset.php" hash="1c8cb5bc2eeae518159cd465678359c8"/><dir name="Select"><file name="Exception.php" hash="2053e8e2e1b9b9b7a8f14d80a9b31b78"/></dir><file name="Select.php" hash="c887eb48cf2759835e5b21d25542f651"/></dir><file name="Table.php" hash="fb0903f084c72db6ffc051e040538588"/></dir><file name="Db.php" hash="8b55f48ca4e5611325d40f30985999fd"/><file name="Debug.php" hash="7fa205ced57ef23bf1c972624d3a2f65"/><dir name="Dojo"><file name="BuildLayer.php" hash="a480ce2bc7f1a86e97ec4d7333888899"/><file name="Data.php" hash="8933e961b9c3cfdfde8258c2d8e9a759"/><file name="Exception.php" hash="629fe7f6232fb9f4bb25c4906b19bd42"/><dir name="Form"><dir name="Decorator"><file name="AccordionContainer.php" hash="ee3a3bb36888e354d21d3c495eb772e9"/><file name="AccordionPane.php" hash="d0fa1f8d577e2d4bf41093329607685d"/><file name="BorderContainer.php" hash="9c15d3498c24da77afab0808ef16134f"/><file name="ContentPane.php" hash="37092fbce7c87f7d87e8122de7f4fa49"/><file name="DijitContainer.php" hash="8f2f6bc88d06a654662b8c15a13a230d"/><file name="DijitElement.php" hash="f3ef24bc1768c7dd85b62dddd86ae9be"/><file name="DijitForm.php" hash="815cd50695c9a6ee31bcb0773c934bac"/><file name="SplitContainer.php" hash="47ef42ae33c0bd64a5415c5d41c75f93"/><file name="StackContainer.php" hash="f506d79d637137e25dc450813f6b62dc"/><file name="TabContainer.php" hash="5379e50003d8eac12e5bb16e3451bf31"/></dir><file name="DisplayGroup.php" hash="08e38c7b9531ef945e4bae4b0d108fb0"/><dir name="Element"><file name="Button.php" hash="3d3ae1e0d2deb52f996cf89ae40ddb91"/><file name="CheckBox.php" hash="1f97437e072256dc310ce88a9ebef494"/><file name="ComboBox.php" hash="2b58e986e68485ead5241bdf7c3773d6"/><file name="CurrencyTextBox.php" hash="d703559dca213a5db0b9660d6cdfe87c"/><file name="DateTextBox.php" hash="22a6de1c46a14e3fdec1cd10c9e608f0"/><file name="Dijit.php" hash="e7d9d14507728d2a6bfb7dd81fdb458b"/><file name="DijitMulti.php" hash="6935eb23d6b8ccc7790b88152793413a"/><file name="Editor.php" hash="e41dda73fcd4763bb126554e7ec08f36"/><file name="FilteringSelect.php" hash="90e331d439d0ac879e4d6dd800079e51"/><file name="HorizontalSlider.php" hash="65e0df8e1e99296b2ad947d8233bb146"/><file name="NumberSpinner.php" hash="315c8e8588e53372ba92deb1846fb3d9"/><file name="NumberTextBox.php" hash="99c48508c2c8e407dbe1f6d14936c850"/><file name="PasswordTextBox.php" hash="219ef588ad362f41e9a518070a4bc373"/><file name="RadioButton.php" hash="ad68a0fb07353afd6dbfee8e0ee6b582"/><file name="SimpleTextarea.php" hash="30fdf2aa995b1ceeeb717bc64a89b1b3"/><file name="Slider.php" hash="c9271a84b8979f7721b5b0014119153c"/><file name="SubmitButton.php" hash="00549fdb830111963cc4ad746b2af994"/><file name="TextBox.php" hash="f9b7e00addc48a891541eb1d0359ad6b"/><file name="Textarea.php" hash="c6d1d878e74a9471eaa53e3d80f93222"/><file name="TimeTextBox.php" hash="36dffa2090cfbc5d27ad6eb8119f0a4d"/><file name="ValidationTextBox.php" hash="007d28a764079d37122df2dc0efee405"/><file name="VerticalSlider.php" hash="2f624adc04d61eac4a35d9e5276cd587"/></dir><file name="SubForm.php" hash="090f14e0b16d817331597392983c3353"/></dir><file name="Form.php" hash="e3a1e3367a8da2be6df1f6640527e9b2"/><dir name="View"><file name="Exception.php" hash="9d418d3a32357fd015c587760b74c98e"/><dir name="Helper"><file name="AccordionContainer.php" hash="3c81989dc76daa417b1495637ba2f3d5"/><file name="AccordionPane.php" hash="1e26cd1e5e8298e2bf2c8da18a77a1ec"/><file name="BorderContainer.php" hash="55be2e96930a77973576358e2d3126ec"/><file name="Button.php" hash="58a56ae96a06cf880e4af9438a876431"/><file name="CheckBox.php" hash="8d79899cb8395e7b09b3c4e89d95e515"/><file name="ComboBox.php" hash="79e3d41cc61145a97f310703481c72a6"/><file name="ContentPane.php" hash="f6d8b0f7fc25a2787dc2fdc45c8fe504"/><file name="CurrencyTextBox.php" hash="fa93bc316a411391a3eb76a0a7da5199"/><file name="CustomDijit.php" hash="670fe42981905326b06f4469f14ff421"/><file name="DateTextBox.php" hash="1308aefc344ee6b3803131798c1a0e01"/><file name="Dijit.php" hash="a565de15877f5b2d5bf543124486b92f"/><file name="DijitContainer.php" hash="294acadcd28ed4c7783fca379e90375f"/><dir name="Dojo"><file name="Container.php" hash="d553f5f9c5f64b3e1acf49d7f248ff99"/></dir><file name="Dojo.php" hash="1d695d0a6021bde3a68cee13666b5026"/><file name="Editor.php" hash="fa004239213f5af234aa8157dc30d191"/><file name="FilteringSelect.php" hash="5d3f3d4319da73d41f6b8a4db341416c"/><file name="Form.php" hash="3fc0b804d671665b6b724941f4f4a007"/><file name="HorizontalSlider.php" hash="8e04b85c983473ef30ae18c7a84e03b4"/><file name="NumberSpinner.php" hash="b3a21ebb0a58a2cb4ed3c3857cf70ed1"/><file name="NumberTextBox.php" hash="7af54f071ec40b74137b5d75f8cff993"/><file name="PasswordTextBox.php" hash="17b31189bb47ed3559eaa46b9da2ff04"/><file name="RadioButton.php" hash="75e8de6c8461a42af09660ef9bd19c51"/><file name="SimpleTextarea.php" hash="aa1b92581eccd9c8a02fc87ab6067c8a"/><file name="Slider.php" hash="bc1376f5861f3ea5b027dbb877d692a5"/><file name="SplitContainer.php" hash="d0f771097fbd9b52298e6cf8e596541a"/><file name="StackContainer.php" hash="323b773ffc3b04774094726228b49a97"/><file name="SubmitButton.php" hash="e08b5db250abb38b6ac8f06ad1065958"/><file name="TabContainer.php" hash="0ad59f8d5318d4919de4c681beb83306"/><file name="TextBox.php" hash="26bf396793234feecb7c847b063e2a99"/><file name="Textarea.php" hash="ba749368a2c59d96ccd59fde8f08d871"/><file name="TimeTextBox.php" hash="ac635a9ffe01cf057a18f7a1bd132c86"/><file name="ValidationTextBox.php" hash="cb2e1ea027857d0c2210932f29701c57"/><file name="VerticalSlider.php" hash="9eb3035d46a56cdc3540c02823967cbe"/></dir></dir></dir><file name="Dojo.php" hash="e6e8c4f4706e0061330fd7f33360e6b6"/><dir name="Dom"><file name="Exception.php" hash="881edb4574efa0ddb2ee9b352d9e9981"/><dir name="Query"><file name="Css2Xpath.php" hash="a73ffd6af47a6b18f05aae315730fd26"/><file name="Result.php" hash="186e7898da59800ed7c6f68ab8da93bf"/></dir><file name="Query.php" hash="79c8561fdcff7d23ee0e332ed76250d8"/></dir><file name="Exception.php" hash="b0ea9ac4c142759db0e502e63831ea9c"/><dir name="Feed"><file name="Abstract.php" hash="139e1373b5e6f159f914de4ffc7c5a52"/><file name="Atom.php" hash="6f160e242e5bf1ac6409ebcc395f59a4"/><dir name="Builder"><file name="Entry.php" hash="a942e299b1cc393e72d9e2653369d049"/><file name="Exception.php" hash="ccd399dd4a9681294d8551bf29ba5520"/><dir name="Header"><file name="Itunes.php" hash="78cc44bcdaea010f6e36e14ee4c56549"/></dir><file name="Header.php" hash="2f78d73801f5973d498a997d9b129fb7"/><file name="Interface.php" hash="4e07ac3b0da445542c6b19d43da34114"/></dir><file name="Builder.php" hash="0f6e2b4f0fdc92df90da1c2f6c0f4fe5"/><file name="Element.php" hash="be0aa60855c61b114a402ed4a069feaf"/><dir name="Entry"><file name="Abstract.php" hash="e68e3b664e0ed84afbe43a8ff8896cb6"/><file name="Atom.php" hash="c8e9d988a8f04e470da1d3267a6ca2fc"/><file name="Rss.php" hash="8eaabbf5c4dfb8803bd94809749b24d6"/></dir><file name="Exception.php" hash="9351f7fb364653cb8035f426b39e84af"/><dir name="Pubsubhubbub"><file name="CallbackAbstract.php" hash="cbcb28534c74404eed81237e6f9dfe2b"/><file name="CallbackInterface.php" hash="a82a4c520d18576d1da1d90fc8de642c"/><file name="Exception.php" hash="fc55bb4b27da93ec23bdb2fd07c07313"/><file name="HttpResponse.php" hash="d56ced329d61648c9294e918784ba71f"/><dir name="Model"><file name="ModelAbstract.php" hash="6cf9ddea20f11011e016f7dd79b23f45"/><file name="Subscription.php" hash="942d07d4364d467b14ccecf3688fc483"/><file name="SubscriptionInterface.php" hash="c25c96bd7952319c752f9bebed8b46c3"/></dir><file name="Publisher.php" hash="5d198756b9f33813ec94c99f43f64d45"/><dir name="Subscriber"><file name="Callback.php" hash="af6986b7ee53d65362e0349539731ff4"/></dir><file name="Subscriber.php" hash="c4455a8895e28a710ffaf8378fd68a27"/></dir><file name="Pubsubhubbub.php" hash="8fb4a4324136b11544c9868f5be8724c"/><dir name="Reader"><dir name="Collection"><file name="Author.php" hash="3c9b653be409158322c3ed0d36f147f8"/><file name="Category.php" hash="61e6d66312686091b3d24d68a11cc999"/><file name="CollectionAbstract.php" hash="2aaa75afb40ad869dd89f77638a70cb0"/></dir><file name="Collection.php" hash="ee9f4c3bb4b8f67574e0c6068af4f909"/><dir name="Entry"><file name="Atom.php" hash="db312e5f14d1c6d3951276daca316502"/><file name="Rss.php" hash="93280282a3b21a806fc99e771f8f710f"/></dir><file name="EntryAbstract.php" hash="dfd36832281d1b76732259b86d53e011"/><file name="EntryInterface.php" hash="f246139859e3885e46a29ef8f15c2153"/><dir name="Extension"><dir name="Atom"><file name="Entry.php" hash="56244bae9c22eaf63184c4cdfffaa36d"/><file name="Feed.php" hash="dffd0695c5acd37b3f0ed8c846eb95c7"/></dir><dir name="Content"><file name="Entry.php" hash="32ee366ab9f153d100bbf87fb52da75c"/></dir><dir name="CreativeCommons"><file name="Entry.php" hash="73b2a1d2a440c80a5befa9e94813f4a1"/><file name="Feed.php" hash="5f92da5eca23e21b74c5128ad8f267b5"/></dir><dir name="DublinCore"><file name="Entry.php" hash="3068b470faf31ac59dc09f5f46450e92"/><file name="Feed.php" hash="80402c9a945bdb94a1d43f333bf8d75c"/></dir><file name="EntryAbstract.php" hash="43cbf86bb869442b86211d295264c78b"/><file name="FeedAbstract.php" hash="6e3d4f22ef3cda89b52a2f2d0f4c3eb9"/><dir name="Podcast"><file name="Entry.php" hash="5b7541a6c40501994667d18ac33f6ab3"/><file name="Feed.php" hash="1757bd351c77865dc153d45a278d1bba"/></dir><dir name="Slash"><file name="Entry.php" hash="d7e1403f6905868af9df6471974a8fc5"/></dir><dir name="Syndication"><file name="Feed.php" hash="9c0e583ac49101db875b09dc89670073"/></dir><dir name="Thread"><file name="Entry.php" hash="4d6b68bae9b6f059649d06e07b8f6e52"/></dir><dir name="WellFormedWeb"><file name="Entry.php" hash="5b3420660e5677d9947bd6a4d4ebcd71"/></dir></dir><dir name="Feed"><dir name="Atom"><file name="Source.php" hash="0bd94cac2a715dca91f72aa40dc1fb90"/></dir><file name="Atom.php" hash="e9337e1d80cfbef4eee9b9528fbdeed3"/><file name="Rss.php" hash="65372348d22b80ae7675f691493271fa"/></dir><file name="FeedAbstract.php" hash="cd65bca38114e73a4f49e74ed8050faa"/><file name="FeedInterface.php" hash="01a5c19f25817010f203890219bf8c46"/><file name="FeedSet.php" hash="eaac43ff3da506f5ba374172672f7717"/></dir><file name="Reader.php" hash="69e04a84ad466bac59fe4c006189051f"/><file name="Rss.php" hash="444b6f6b39b2ac8446d398d12444a00b"/><dir name="Writer"><file name="Deleted.php" hash="ee4316ec5bde88ede0a4cd8183e95d6f"/><file name="Entry.php" hash="3d165ad78099692cb14b5067dd55ec0c"/><dir name="Exception"><file name="InvalidMethodException.php" hash="90a0fe1aedd3ef3222fcfb033f359e0f"/></dir><dir name="Extension"><dir name="Atom"><dir name="Renderer"><file name="Feed.php" hash="ec82e44f180d2e7eab5254183769dc38"/></dir></dir><dir name="Content"><dir name="Renderer"><file name="Entry.php" hash="70e77357c124943cfb159a5b13d413f6"/></dir></dir><dir name="DublinCore"><dir name="Renderer"><file name="Entry.php" hash="c8b25571aa21565af3fd95d3cd882dee"/><file name="Feed.php" hash="5da2d938f05457ee170cdf8932525f8a"/></dir></dir><dir name="ITunes"><file name="Entry.php" hash="57a46188d7a3de20488f2d6dec5d0fa6"/><file name="Feed.php" hash="83395c65ef1b2575ccfea179ea62443e"/><dir name="Renderer"><file name="Entry.php" hash="a407371ac8116826d5c5c807e522c4a0"/><file name="Feed.php" hash="ed4316c9015aa708dacd07899e17bf1e"/></dir></dir><file name="RendererAbstract.php" hash="9dc8929c8cd8490df484b9e756bf74de"/><file name="RendererInterface.php" hash="c8ec57b4c8f56b014d0c1ef6224eae08"/><dir name="Slash"><dir name="Renderer"><file name="Entry.php" hash="c704547975b6374e5bf8433e0d1f12c6"/></dir></dir><dir name="Threading"><dir name="Renderer"><file name="Entry.php" hash="b61fa1db1bb5fbf43ffc7f595916efdd"/></dir></dir><dir name="WellFormedWeb"><dir name="Renderer"><file name="Entry.php" hash="220f68249c5727e7e4fb7fa3162a6045"/></dir></dir></dir><dir name="Feed"><file name="FeedAbstract.php" hash="08fc24b7251a32759204465ac5a60076"/></dir><file name="Feed.php" hash="5f172627e273f3bf77757a6c29665a9f"/><dir name="Renderer"><dir name="Entry"><dir name="Atom"><file name="Deleted.php" hash="d0a79aea784a2dec1cff51c07bbe4b31"/></dir><file name="Atom.php" hash="7b526b53bbaf3a5598535d57349273f5"/><file name="Rss.php" hash="5d3f8cbbe936de00180b32ea8c72e67d"/></dir><dir name="Feed"><dir name="Atom"><file name="AtomAbstract.php" hash="edf3bbf242b9490cd9d44e3c7639034f"/><file name="Source.php" hash="91cec2cf939b43001d79f1d9967c5387"/></dir><file name="Atom.php" hash="d2c293b8e6e17820a2512d7981aab87a"/><file name="Rss.php" hash="e7bc6eeecb6945172dfd4c99daab6895"/></dir><file name="RendererAbstract.php" hash="e9285bcb50b0dd037af1f09f149640b2"/><file name="RendererInterface.php" hash="67e8c442d7c8e544885276ffd0b581a6"/></dir><file name="Source.php" hash="080959382736914525c74ce996fb0280"/></dir><file name="Writer.php" hash="38aab448df2846e2f3c77d37e22ee979"/></dir><file name="Feed.php" hash="db665a2359c9dbc79f3fdf5dfe066c74"/><dir name="File"><dir name="Transfer"><dir name="Adapter"><file name="Abstract.php" hash="68781d51a4549fbb1f2f10b408693b2c"/><file name="Http.php" hash="e2a1f273c057a1dacba14e5015856a41"/></dir><file name="Exception.php" hash="3d029761b7874c74d608ad4bf4bf6518"/></dir><file name="Transfer.php" hash="77183a67b7e5262322a3b00a03d9c1e2"/></dir><dir name="Filter"><file name="Alnum.php" hash="b315da53a8a8da7fea26ba7fdb6a19da"/><file name="Alpha.php" hash="d40b4a5b721b88e946b372086c7d8313"/><file name="BaseName.php" hash="e6719bbd0f5d6005ff521bfc186cfe0a"/><file name="Boolean.php" hash="9893ce306e2f89f3550ff6d02ab0d962"/><file name="Callback.php" hash="694b9fd06220016b396196f458401b06"/><dir name="Compress"><file name="Bz2.php" hash="833babb46fba465754d150ab5ea0af05"/><file name="CompressAbstract.php" hash="5711d16d446723349f699108e2459017"/><file name="CompressInterface.php" hash="57dc11590120af393023a57c108b9712"/><file name="Gz.php" hash="c6ede5a52ac849420b88358455fb11fc"/><file name="Lzf.php" hash="51ff8b8b26038764ca225f4d1ec844b7"/><file name="Rar.php" hash="e00605b4b10575734a75d06ea7ca26b8"/><file name="Tar.php" hash="4a2486ab475ed057b8c4835d98ee4dd1"/><file name="Zip.php" hash="f1a35886800405c54ea885653b66c20e"/></dir><file name="Compress.php" hash="7ff4808a714d40da3a41ab81c5077ad7"/><file name="Decompress.php" hash="d92e7387a73cd80279426a2e097fd443"/><file name="Decrypt.php" hash="532ee1d528cbc51b4e14e25d78c16050"/><file name="Digits.php" hash="2fea334d05d3b40afe529754abb348bc"/><file name="Dir.php" hash="5d8730f1bdec849f66aa1185c5d15b19"/><dir name="Encrypt"><file name="Interface.php" hash="b8819a18065178fe2353dd76be8c5791"/><file name="Mcrypt.php" hash="8d1e84a4a894e9cf144f2dc1f959ecfc"/><file name="Openssl.php" hash="133b40bfa81e402a67f90689b0791308"/></dir><file name="Encrypt.php" hash="e70fcfc073bbcb086c59120d5a50ed6b"/><file name="Exception.php" hash="48dc3cb095fc0b51184ac564d39068b3"/><dir name="File"><file name="Decrypt.php" hash="3a61fbd8504851a4554cfe1b37620731"/><file name="Encrypt.php" hash="3acb33b7d23819f6b99a73be1b7b7af9"/><file name="LowerCase.php" hash="4246b0500e398184c243e52ac3c7b7f2"/><file name="Rename.php" hash="4eb59a724f0d243c85409a78452a3229"/><file name="UpperCase.php" hash="d5589534c6e5955821befbe9e6e77ed4"/></dir><file name="HtmlEntities.php" hash="b040e456a67c46bcc318d40c0969e4b1"/><file name="Inflector.php" hash="20faa13efe8a3cec6da0b7abfd2d31dd"/><file name="Input.php" hash="2bcbe0296f1ee09fac8add7d29203cc8"/><file name="Int.php" hash="b32a5dd38e2a3c5a7bd21c9da8db5e48"/><file name="Interface.php" hash="28c0b9ef2d067bbc5f3657828e9e0692"/><file name="LocalizedToNormalized.php" hash="20c16adfe3af5af320c4403db2f9f409"/><file name="NormalizedToLocalized.php" hash="8c19ea920c25b31d40fe19fbf986430a"/><file name="Null.php" hash="705c23f8bc62e19ced2e4da6cddbf91a"/><file name="PregReplace.php" hash="5c06a3e5220ef5a097098a1ad43686a9"/><file name="RealPath.php" hash="a069bc968bc54254aede0e8d5f5e73ae"/><file name="StringToLower.php" hash="28b02516640710903a49f16f9c7eb809"/><file name="StringToUpper.php" hash="d964441073324c220be3a334fdf9609d"/><file name="StringTrim.php" hash="6043e1449e69a9efc1f29c6b58b4a67b"/><file name="StripNewlines.php" hash="9cd40bc0f738ac98256c761aa92eab41"/><file name="StripTags.php" hash="ff0f6a07f43455725399dd58798c1ac7"/><dir name="Word"><file name="CamelCaseToDash.php" hash="8cb4996585e5b5c5aa0735bd367a069b"/><file name="CamelCaseToSeparator.php" hash="a1fa16a3d056eb9e10c94bed076757e7"/><file name="CamelCaseToUnderscore.php" hash="e345e75594fe08b356f17f1dc021b2bb"/><file name="DashToCamelCase.php" hash="2755b587a16977df5414f722fdd5919c"/><file name="DashToSeparator.php" hash="adebb3ccc1ee4604c6b866a9063a1976"/><file name="DashToUnderscore.php" hash="9f454590683d634855b2c581e1e9da9a"/><dir name="Separator"><file name="Abstract.php" hash="4e7b4389bd07281e1edd9e93ac153526"/></dir><file name="SeparatorToCamelCase.php" hash="2e4e60987981211d29c37caf390d8984"/><file name="SeparatorToDash.php" hash="ef05d88bd88e064183126ed2a595e0fa"/><file name="SeparatorToSeparator.php" hash="35bc7e38c7b26a2fe07caf653ebff94f"/><file name="UnderscoreToCamelCase.php" hash="1c8f327c1e80c07242637cdb50d7cbea"/><file name="UnderscoreToDash.php" hash="444e543c8895c29d4f66fb156ccb82c1"/><file name="UnderscoreToSeparator.php" hash="b66a02169c5ad1321c5d1b3dc7c7c8bc"/></dir></dir><file name="Filter.php" hash="c18043e9483fb93335a31915756b761c"/><dir name="Form"><dir name="Decorator"><file name="Abstract.php" hash="755489cfaf97198f6d9a6e85218c3f73"/><file name="Callback.php" hash="03ff31ed3245673c035da866441ba483"/><dir name="Captcha"><file name="Word.php" hash="03246137192324e88d1d9c1deaa29863"/></dir><file name="Captcha.php" hash="b83c867c8605b032f9956a1c1a6acf94"/><file name="Description.php" hash="80ada6a1b8988d5477f5cd2ab2a29626"/><file name="DtDdWrapper.php" hash="10c6d0ec67cab6755dac10936b600663"/><file name="Errors.php" hash="a0ebe7f94105de8c88ba50db4a72ace7"/><file name="Exception.php" hash="44dd60f0df8f7adee66b809e843e590d"/><file name="Fieldset.php" hash="fbf2c980ed0faf827518ec232564e5e1"/><file name="File.php" hash="f09f5153f5b614f8c8a1f16e26ef0215"/><file name="Form.php" hash="b812eb267cc83afba9a24042149f6f4c"/><file name="FormElements.php" hash="5f9cdc290b545418e6b255449a5e238f"/><file name="FormErrors.php" hash="d1392afc6811a318d018eb483bbb1ab0"/><file name="HtmlTag.php" hash="a7c77798b747300877f4d0a41655dc4a"/><file name="Image.php" hash="b89f08d47618fe791273993f9978525c"/><file name="Interface.php" hash="bc80c41ab5e2d65b48163f40db8da612"/><file name="Label.php" hash="9b9126faa6e017c9d631650d4a32fc2e"/><dir name="Marker"><dir name="File"><file name="Interface.php" hash="1f52ff650a356c7fe55b5d0f9619f76a"/></dir></dir><file name="PrepareElements.php" hash="f3b1d785930c2cea8cc27b4612525837"/><file name="Tooltip.php" hash="8cb73b17595d2ea73c3030b61f65dfc8"/><file name="ViewHelper.php" hash="62f40a3beab0278421e3ab2c3fb2bc45"/><file name="ViewScript.php" hash="2c324b8714c3710cfd3926b9cf52cf83"/></dir><file name="DisplayGroup.php" hash="9e744fbd94488757321cdf82646176de"/><dir name="Element"><file name="Button.php" hash="35fa7853ba64542f88fc9683ad86f386"/><file name="Captcha.php" hash="d711c282dcec2574e8d8d1593d800375"/><file name="Checkbox.php" hash="0a3bc916ee7e52a70a63cf02f255d351"/><file name="Exception.php" hash="c767faa61a600322cecd821ba10e2a67"/><file name="File.php" hash="2a47b19756d8d35a93a2d05002530d1a"/><file name="Hash.php" hash="a90c75d435e972ae1c6ff034abdf8b95"/><file name="Hidden.php" hash="2fb6ccae894b64fe85d6bd04c69f57a3"/><file name="Image.php" hash="55823c85177510f377603b5d54f90857"/><file name="Multi.php" hash="76f917a74c9ac48e8cd0d978000bc101"/><file name="MultiCheckbox.php" hash="152e25f34cd2ed63b4d5005976bc1ed4"/><file name="Multiselect.php" hash="d89643ebd3004c57f8134c9d75c3dd2f"/><file name="Password.php" hash="389198b4e7c143ae79f74cb3e666fd10"/><file name="Radio.php" hash="9f0409f44f6c6dfa448566e91e10991b"/><file name="Reset.php" hash="5b8e748a3777022543026ee47a72fb6d"/><file name="Select.php" hash="86f94776b438674953d73e7e7a6afcb8"/><file name="Submit.php" hash="60762394e68cfcaca34a4aa8bc686e68"/><file name="Text.php" hash="723479da193e453baffb5971d39eb80a"/><file name="Textarea.php" hash="03acc9d0f0be5038ba3060bc61be8c26"/><file name="Xhtml.php" hash="dddafefd1d44d5073b0f0dcc18c3a55a"/></dir><file name="Element.php" hash="2a162cd9b4bc7e706f26d306ed60032c"/><file name="Exception.php" hash="7844965a8e76d68bbc162060d0bec37a"/><file name="SubForm.php" hash="83ce9846e6b2c90b6543998e0ff03e3f"/></dir><file name="Form.php" hash="ff642b7e89e20242614e35b58e64bdd0"/><dir name="Gdata"><dir name="App"><file name="AuthException.php" hash="dafe4cdc5107f95c558f778d8f46a2e0"/><file name="BadMethodCallException.php" hash="896d4e1d6a89b67c52fdf5c9a389a469"/><file name="Base.php" hash="cbdec8fff7cad43903c868996f5ff766"/><file name="BaseMediaSource.php" hash="acc1f19c8799939795f5da69276ed51f"/><file name="CaptchaRequiredException.php" hash="d761ab835e1b383aa613abc06984b8f5"/><file name="Entry.php" hash="084c3e74a8a25340f1fd1fe86813baf6"/><file name="Exception.php" hash="3513cd91ea1b607b60412dae92fff7c9"/><dir name="Extension"><file name="Author.php" hash="a9219f9e3e0079856094089680afd948"/><file name="Category.php" hash="3fa671656ed818f6e8abb24e4036ac4e"/><file name="Content.php" hash="977281362aba059b0bed0d271df7ea4b"/><file name="Contributor.php" hash="3a9c7d44f0b5502da5a2b322eaf6d9f1"/><file name="Control.php" hash="3a11a0f7db5771a02982674ed24afda8"/><file name="Draft.php" hash="79147684389348dbcc3059302668e4ed"/><file name="Edited.php" hash="eef80f865d134b216786d66dabf68611"/><file name="Element.php" hash="038c92e8030f40ebdcada569f569e69c"/><file name="Email.php" hash="69ae7e4b2bf0d58953d42581ade9def7"/><file name="Generator.php" hash="e0969b4de92b7af7a8e39245e1d32e4c"/><file name="Icon.php" hash="b3365337bef7580667c5ba5e00e3cb49"/><file name="Id.php" hash="c0a92139b7cdde83e8333276bc3c9052"/><file name="Link.php" hash="4baa659805d2d0a7031f4fae71ea260f"/><file name="Logo.php" hash="f8d59064b8e30b23765132666840e56e"/><file name="Name.php" hash="793ea259319533664ba08d44b003cc21"/><file name="Person.php" hash="1cf40277a6d721f47c135c05875646fc"/><file name="Published.php" hash="16ea825a8daca931177414d8a458b1d8"/><file name="Rights.php" hash="bfb3e8b68c24de3d8f080f88576eb7ed"/><file name="Source.php" hash="9640c652b2de40df151ac4960ffc90cc"/><file name="Subtitle.php" hash="4da29cf3540cef94206e18ecfea50913"/><file name="Summary.php" hash="a32ba07b3cdf7a622b4b0e7b4b787bf8"/><file name="Text.php" hash="9dc6ae7805f9590fdfb68fb6c9cbbb19"/><file name="Title.php" hash="857626a892196e33d59605df883ec1e4"/><file name="Updated.php" hash="bab9ee56615e27465259b59d87bad992"/><file name="Uri.php" hash="46cd547ba591c99d6a189de0b6ff05e3"/></dir><file name="Extension.php" hash="14efd7f275aa31477175f805e8efcef1"/><file name="Feed.php" hash="1373890c784a788cb9120b559666a609"/><file name="FeedEntryParent.php" hash="35711bb9dd1148ac9e8202c3580b5740"/><file name="FeedSourceParent.php" hash="ef583882788280051bdb0accb3d045f3"/><file name="HttpException.php" hash="6011b38d14ae61cb7584b185103fa89c"/><file name="IOException.php" hash="dfd7f3e02e993c12e1d455c298601f10"/><file name="InvalidArgumentException.php" hash="c15c5bdcd6aed78b7848862b8012df98"/><file name="LoggingHttpClientAdapterSocket.php" hash="97ec7fbf4567c00ad86f6a64149b410f"/><file name="MediaEntry.php" hash="1ad9ebcc6bcd62a5a41f5c75e68bd3d6"/><file name="MediaFileSource.php" hash="de015094b9ed1504b7b9a52eb60c5e0d"/><file name="MediaSource.php" hash="26fb7760afd66b0712fdb214800040f8"/><file name="Util.php" hash="7f11f068e617d68c510a3b66aa604e60"/><file name="VersionException.php" hash="e94c868bae1284f3baf41fa38366e7d2"/></dir><file name="App.php" hash="783234a15a94f25c783264b267a81313"/><file name="AuthSub.php" hash="5ff6de2736605e3b7eae9eed5669c38f"/><dir name="Books"><file name="CollectionEntry.php" hash="cf8499eeed580bafc6063b4498b6d12d"/><file name="CollectionFeed.php" hash="c884a194faeb2f9f1faed5abdf2155e6"/><dir name="Extension"><file name="AnnotationLink.php" hash="c060fca50132495aad7de8ebe60febe4"/><file name="BooksCategory.php" hash="135ae6c56547aa40388e99eb7b2a5532"/><file name="BooksLink.php" hash="8328614d57f7b6fe2851406ceb4718be"/><file name="Embeddability.php" hash="967600bf45ff5e89f1b1a1a2ac3a9600"/><file name="InfoLink.php" hash="bc57f9df2d57cd83a605a120c0ccb0ae"/><file name="PreviewLink.php" hash="98fd4b8a6b7a4bccc775fa411a362c53"/><file name="Review.php" hash="c4d7b715618b1f9c2629751dceec25ff"/><file name="ThumbnailLink.php" hash="a5ea9ffb3bfa2c866318d7fbb812a7d1"/><file name="Viewability.php" hash="78da385862c03ccccbe9683843a345f5"/></dir><file name="VolumeEntry.php" hash="1242c2eb1f17b4ed3b81d54e057a8c5b"/><file name="VolumeFeed.php" hash="135e632a945971c5b9b30174e282eacc"/><file name="VolumeQuery.php" hash="ca06dc4105c93d28b5d2faab843a8a8b"/></dir><file name="Books.php" hash="e58d30942ec3a9212a2635024b2af6cb"/><dir name="Calendar"><file name="EventEntry.php" hash="8565208f9f861ee3cb0098a0bbcb1c0d"/><file name="EventFeed.php" hash="9a2953356c57f01945cff80f3d9727fb"/><file name="EventQuery.php" hash="28372daf3fd5d234caa1a4f6921f8b6e"/><dir name="Extension"><file name="AccessLevel.php" hash="becc596041c13606d75410e0b5d39887"/><file name="Color.php" hash="9a4ea52e45bd90be41d645a64bfbb464"/><file name="Hidden.php" hash="7607d579c428a2f7659d8b4ecaee9ed3"/><file name="Link.php" hash="82cf74d45599b4a96781238bd4bf6a5e"/><file name="QuickAdd.php" hash="798696d7ac96d3f40cd718eca881cf2d"/><file name="Selected.php" hash="86cad9b49aec998020c122452f01d86e"/><file name="SendEventNotifications.php" hash="9e7398a20109537194a9aab4602b6b61"/><file name="Timezone.php" hash="feecf6f3dda3edb6b3f60b9dad969e98"/><file name="WebContent.php" hash="6747b1492abebb275afe89e0a5e65fb9"/></dir><file name="ListEntry.php" hash="c4917d4087edbb59c0718a48745cd0a9"/><file name="ListFeed.php" hash="a7ac1210c132777fe72ea8bffd7d1799"/></dir><file name="Calendar.php" hash="7951e3a7176940fcfb4d9fa77bddf10c"/><file name="ClientLogin.php" hash="385047018d696111ff28160eb5e1e75b"/><dir name="Docs"><file name="DocumentListEntry.php" hash="3c7077ae5748fb60aa527881a47e390a"/><file name="DocumentListFeed.php" hash="7a370a17a489f3858249b5f5daa9aab5"/><file name="Query.php" hash="b1d8046ca542d954cedd51abd77a1884"/></dir><file name="Docs.php" hash="d043b0dd1aa398fd19bf316a1fef83a7"/><dir name="DublinCore"><dir name="Extension"><file name="Creator.php" hash="21dc3287bf3d2b818d9eeca185312014"/><file name="Date.php" hash="331aada4901c339e18ae2c6954dfac6b"/><file name="Description.php" hash="0325ad1faae9d4df7b14a5cb6b7f8a09"/><file name="Format.php" hash="ae9e4cc1a8778eac359461cafe8daef7"/><file name="Identifier.php" hash="f0de487d33e7795d019bbe268de12fa6"/><file name="Language.php" hash="b4fc29d1f67d5c28d629f748ae104c9f"/><file name="Publisher.php" hash="5819646e1d78c244dcda129e052a3447"/><file name="Rights.php" hash="8b2c0c73069fdc826c3876078484cdd8"/><file name="Subject.php" hash="314feaa0f3c88248df2cab6a97fe3c49"/><file name="Title.php" hash="49df143b108bf3a88945fc7575e97db4"/></dir></dir><file name="DublinCore.php" hash="f0bb6e884201f255f79cefe94b281e2b"/><file name="Entry.php" hash="03e718567522e317d5cb16b89ac23282"/><dir name="Exif"><file name="Entry.php" hash="7dbecf16b18d2c7c24280d31117383e4"/><dir name="Extension"><file name="Distance.php" hash="2e8c489438c5ba563a22f633bf50500c"/><file name="Exposure.php" hash="5af0eee89a7fed6aa7cad2c6c5f7aa6c"/><file name="FStop.php" hash="53e0d5e924ccd0c287d2a76f11daa8f6"/><file name="Flash.php" hash="9abbc2d688045aba18e4f53ed5827152"/><file name="FocalLength.php" hash="22a6e681aacce0c179c00af23527ac86"/><file name="ImageUniqueId.php" hash="f1ae3677af856c25a01e4867d9895d23"/><file name="Iso.php" hash="d2d477d7f88e8244541a2170b072aeaf"/><file name="Make.php" hash="9c64f7d029319d3bbb3f117ba3b8e420"/><file name="Model.php" hash="583dd823d71e35ace4fed34c6de341b6"/><file name="Tags.php" hash="9f2dc21a394f4341276505bb234e2768"/><file name="Time.php" hash="4dbbaf07ce5c837fc0f5dd2ce6ec7060"/></dir><file name="Feed.php" hash="1d842d76fd3def71c58b0dd7deaf32e1"/></dir><file name="Exif.php" hash="de642ad1c5c0c106148ffb69dcda995b"/><dir name="Extension"><file name="AttendeeStatus.php" hash="2c6ef38b84b7952195e6fde0b6560945"/><file name="AttendeeType.php" hash="53de83ef3a8c134b385a8e3cbfb5dfe7"/><file name="Comments.php" hash="5fb679f97b3ccb5a2ce5e758ae4ee4f3"/><file name="EntryLink.php" hash="dca51cf8e7c9d7920e5f244e54d3d77d"/><file name="EventStatus.php" hash="0392ca6298aeb0194992331a17aa583e"/><file name="ExtendedProperty.php" hash="de4c44555d05557911a151f56e9f5606"/><file name="FeedLink.php" hash="4b4a03ce2e8a4e0919b3a318080c5c40"/><file name="OpenSearchItemsPerPage.php" hash="bce47793cba11e44bff4ac82d6cda5a7"/><file name="OpenSearchStartIndex.php" hash="f6394368dbfac82d6b27f3cfbec362eb"/><file name="OpenSearchTotalResults.php" hash="d81fba620bead8d8e546defc0b0c45a1"/><file name="OriginalEvent.php" hash="a0a05b520df8d9b34281df28b36f1a4d"/><file name="Rating.php" hash="2df30885ca8daa018331b6dc98cd3266"/><file name="Recurrence.php" hash="ce05a8b397fa81684e4ee5f06227ca45"/><file name="RecurrenceException.php" hash="767556544d0c9037e2faaa2e8996c727"/><file name="Reminder.php" hash="a9a964a059e2fcea3995cc7588c4d331"/><file name="Transparency.php" hash="b7750b6589196a7b626b9cf45cf2e4f8"/><file name="Visibility.php" hash="9daef3095ae55ac32eafa57c42439f78"/><file name="When.php" hash="f37bbe0fcee3d728c116a5d9bc105baf"/><file name="Where.php" hash="697ebcd0962c969a9e8bdf139411f2de"/><file name="Who.php" hash="e44b055a8f65999cdb26790373311f9b"/></dir><file name="Extension.php" hash="a916325fe15e99d39be570552e72928d"/><file name="Feed.php" hash="111046b29275399adad6ec2d697b242e"/><dir name="Gapps"><file name="EmailListEntry.php" hash="b5575285578636cee26fd20401300172"/><file name="EmailListFeed.php" hash="4f63edfdbdd678de525ed2cfd3ee7d54"/><file name="EmailListQuery.php" hash="4c14041e77226675b6f8346b2e2d77af"/><file name="EmailListRecipientEntry.php" hash="587b955ef0f8e064f7da2c37545b0e33"/><file name="EmailListRecipientFeed.php" hash="65b991d6dd50dedebf6275b19d78327e"/><file name="EmailListRecipientQuery.php" hash="ad1becd333067676f5322d821aa33cbe"/><file name="Error.php" hash="e2c9ffc479706f5a3b72af0be83154d6"/><dir name="Extension"><file name="EmailList.php" hash="f08bdfbcab10c6319d06a5db3984c24b"/><file name="Login.php" hash="4825c925a3047a5dc6ab128e5f9e92a4"/><file name="Name.php" hash="e8bc0f5e3382452b1db7eff43b075c07"/><file name="Nickname.php" hash="b08f1b4b86e72f158dcafc95b88c8d0a"/><file name="Property.php" hash="45099393703f8e9cbf9f821f1e20c755"/><file name="Quota.php" hash="839ca4e864fd1f02c4e7541561944437"/></dir><file name="GroupEntry.php" hash="8ea5f53a7b859eb2ccc580322af3efc4"/><file name="GroupFeed.php" hash="a6a488afeb155498461229fa3a8d8c9e"/><file name="GroupQuery.php" hash="99a6daced7da35c34b06221f2a18163a"/><file name="MemberEntry.php" hash="516b59262b6d288119a75a3d64930512"/><file name="MemberFeed.php" hash="c3cea28272a0b6a13d79640b3d222898"/><file name="MemberQuery.php" hash="64daef36a1761488fe4c6d277772a65e"/><file name="NicknameEntry.php" hash="4f400cfd1e15cb5d23320b1ac12a675d"/><file name="NicknameFeed.php" hash="e678adae36e017057b7055eb8281df5f"/><file name="NicknameQuery.php" hash="74a07970654153a28198ceedf18b5e74"/><file name="OwnerEntry.php" hash="3ab128aed6a244ccc8152713b9b9d7c7"/><file name="OwnerFeed.php" hash="e1aa197a8d82188bc156c59a0c4500ba"/><file name="OwnerQuery.php" hash="7054f70168b9337acc21edb317aa2c88"/><file name="Query.php" hash="9304a44f39a03bda6f2651abd3b6b274"/><file name="ServiceException.php" hash="2f385f9ac48783a8443fcddc95c4a7ff"/><file name="UserEntry.php" hash="d9f11d0ed33a080a1d56500cf0d8af9d"/><file name="UserFeed.php" hash="6497a3b02523aeb85702aa9fdb3ed4c1"/><file name="UserQuery.php" hash="8a470de9fabf68bf279659f58f0d8c4f"/></dir><file name="Gapps.php" hash="f85885ad11fad92a7616b1e0420ff319"/><dir name="Gbase"><file name="Entry.php" hash="0bb98100a8fa19507a041805da078250"/><dir name="Extension"><file name="BaseAttribute.php" hash="6f26832d425537cf7872d3f673bf211e"/></dir><file name="Feed.php" hash="7aba3d96b8f4307807c67c328f05b0c4"/><file name="ItemEntry.php" hash="73de75c90ee7e1451d73486d8759b553"/><file name="ItemFeed.php" hash="9e46661171e84d403a14990ca8d430c6"/><file name="ItemQuery.php" hash="2bf9f5765b99368d8bd79fe5f7c01ec9"/><file name="Query.php" hash="c4c41b592ceaf653de243a8db221a070"/><file name="SnippetEntry.php" hash="01fe325b22181274b9ced74c59a92744"/><file name="SnippetFeed.php" hash="c912e454d061bec340189b54f40cd89d"/><file name="SnippetQuery.php" hash="c42dcaf129a6c9c30d79ba010d3ca694"/></dir><file name="Gbase.php" hash="ffd1751d7b6e94638c07235d256753a7"/><dir name="Geo"><file name="Entry.php" hash="d4b1c48fa800ae53d66c882a076035e9"/><dir name="Extension"><file name="GeoRssWhere.php" hash="98420b966a884fa27b2d689573d397c6"/><file name="GmlPoint.php" hash="890824a42a0fa5a82b94c5bb61465715"/><file name="GmlPos.php" hash="b50fd90e01ea5269c84435637549dbae"/></dir><file name="Feed.php" hash="e670e07a3aabfec4547d4eb183896df0"/></dir><file name="Geo.php" hash="0e5beb7ebbfe5af1f55126aa4949497b"/><dir name="Health"><dir name="Extension"><file name="Ccr.php" hash="2d0fd9e627f818a52486fa147d874ed1"/></dir><file name="ProfileEntry.php" hash="cb65dab13e571dce493c30fdd854eed8"/><file name="ProfileFeed.php" hash="8e9310c5b4ca353f5ddbc3e14d76abc7"/><file name="ProfileListEntry.php" hash="eed5c007ce9526c1058c067eab43e368"/><file name="ProfileListFeed.php" hash="fdd4f07083dd3616da1d35957ab5ddd4"/><file name="Query.php" hash="4f09f6d9c0498835a6a97a6c7b0f6eb0"/></dir><file name="Health.php" hash="0e5946b15e359f353b62c13570fb9322"/><file name="HttpAdapterStreamingProxy.php" hash="229f56928f05d4cc5ddf9e7121d23f27"/><file name="HttpAdapterStreamingSocket.php" hash="165df5b41782ae5b958f916b292bf627"/><file name="HttpClient.php" hash="b3cb6dd0d7265c27a07800b7255f53d4"/><dir name="Kind"><file name="EventEntry.php" hash="57abe194d6100828ce49238f58c9b481"/></dir><dir name="Media"><file name="Entry.php" hash="33afba55df4d70411b219957daabcbe6"/><dir name="Extension"><file name="MediaCategory.php" hash="cda46bce07c027e2bd6687fb4bd081dd"/><file name="MediaContent.php" hash="d553bf16c65f14dd66bec8dd4194704e"/><file name="MediaCopyright.php" hash="74b90eed8ed626dba88740f3166bb77d"/><file name="MediaCredit.php" hash="7572db71a54072c9d2ffee05133c8ca5"/><file name="MediaDescription.php" hash="ce54285481c4c602048c91a5d616b62b"/><file name="MediaGroup.php" hash="462d3d373f59902f8df0f8b152e23317"/><file name="MediaHash.php" hash="3c8aa067a740c3d9e7b07e178652f2f2"/><file name="MediaKeywords.php" hash="3074e0d7f0ddd611e98e49e6424a1daf"/><file name="MediaPlayer.php" hash="24688db3c50726ae5947ec8146ab0c40"/><file name="MediaRating.php" hash="8bcd07c76fa54830a20dfc8f394617a5"/><file name="MediaRestriction.php" hash="0e78a89c5c5d32102f79e3d7261f638e"/><file name="MediaText.php" hash="9cb5037e0c7ba098d1948e167c51ae07"/><file name="MediaThumbnail.php" hash="40ff7fd94ee19fc73e97bc86bb9d24af"/><file name="MediaTitle.php" hash="13f001d7b9e937442410621be21843a3"/></dir><file name="Feed.php" hash="99b64a9c925c2d243170ab806d607c39"/></dir><file name="Media.php" hash="6e38dbb79d60fd7dffb41eb285188bfa"/><file name="MediaMimeStream.php" hash="31a8e1a910c2253de2e1c288c8f4828c"/><file name="MimeBodyString.php" hash="bf4701e590e4a1f2345db3857f11dfc7"/><file name="MimeFile.php" hash="c4086b5c46d05afb25336790ef5827dd"/><dir name="Photos"><file name="AlbumEntry.php" hash="da4e190b77d1b28196137051507ab146"/><file name="AlbumFeed.php" hash="4e13cad3a8ba9240cc46842b2829d21d"/><file name="AlbumQuery.php" hash="65faf1ce0f8829f355799a8319d95578"/><file name="CommentEntry.php" hash="48a62dc306ed6c04351e6ffe4c10cba1"/><dir name="Extension"><file name="Access.php" hash="16c77c08e469145c026706555c7c065c"/><file name="AlbumId.php" hash="deb5dae6da8dfe31e83ed9dde515597f"/><file name="BytesUsed.php" hash="f6537d49020f4bceb94d710872aef22d"/><file name="Checksum.php" hash="6aa6e3bc79594e69a7794b0fbca516a0"/><file name="Client.php" hash="4198b9aa9922cbb020fb115af75a2103"/><file name="CommentCount.php" hash="cada7442bcb5c2520ba50f7f215b6211"/><file name="CommentingEnabled.php" hash="5296dfb145f3e4f847a9f6f4efc9d35c"/><file name="Height.php" hash="2f33f525616e48373d63e8c0bb0496a0"/><file name="Id.php" hash="617bf1df21305f380804b0d064ddea9c"/><file name="Location.php" hash="bb686baadd5f31529cfde142ab288bbe"/><file name="MaxPhotosPerAlbum.php" hash="f746e07f4077668d27c9a66415212e92"/><file name="Name.php" hash="9960563416e5cf5eff83e20376a25d68"/><file name="Nickname.php" hash="113d8a85bf8dbe17a175e001a80866b4"/><file name="NumPhotos.php" hash="70cb5bb225abe82e604f0dd8ae946fab"/><file name="NumPhotosRemaining.php" hash="174a70f7c4fa4e6f27b48cb314b3b8e6"/><file name="PhotoId.php" hash="236d2b19a18b335c19752c9e761acd84"/><file name="Position.php" hash="244bf28f923c15c52ce9ba21ef9c44cd"/><file name="QuotaCurrent.php" hash="74d804a5fd83ac128e60da907b2663db"/><file name="QuotaLimit.php" hash="588bc073ebd65858b44a3d127a222603"/><file name="Rotation.php" hash="330026e94beb9d776b0bd161ad43550b"/><file name="Size.php" hash="f3bffe8fe35890f037251ba699da209c"/><file name="Thumbnail.php" hash="690ccbfbb2bec35a4a449d9edc2f4558"/><file name="Timestamp.php" hash="c91e1b32736e75e694dc5831f3c31202"/><file name="User.php" hash="70bc5ce7b645ca74018b1d8380081ce2"/><file name="Version.php" hash="e2d6588507c2cddf8a7bd3f3a5e4440b"/><file name="Weight.php" hash="72a5f47eecade25557b455b0dd5d408e"/><file name="Width.php" hash="9592ea16121fb72cb884932723c751a9"/></dir><file name="PhotoEntry.php" hash="6554216e5fc9437107dd0325bdc87a9e"/><file name="PhotoFeed.php" hash="920463cc75c6731848326d99972be111"/><file name="PhotoQuery.php" hash="1d6cf93aea7a500734b4b798572c7987"/><file name="TagEntry.php" hash="2ab4316c0e4c9290c88bf76b0ed10e2d"/><file name="UserEntry.php" hash="14449d7babe02ffb21136379ff5037b2"/><file name="UserFeed.php" hash="77b2371ce38ec506eba5976fa471a0cd"/><file name="UserQuery.php" hash="eda349b6e04a9910bccf26706e92842c"/></dir><file name="Photos.php" hash="0d3d4657928e6f4d4b859255fa7003f8"/><file name="Query.php" hash="545322f010b5765508f28aa086e4f1d6"/><dir name="Spreadsheets"><file name="CellEntry.php" hash="e835436dc3709981eab3d0ac4ad1fef3"/><file name="CellFeed.php" hash="5534dcf7e39a9a462c0222582c973eea"/><file name="CellQuery.php" hash="bd437fa2051b4363e52f9968eed37a25"/><file name="DocumentQuery.php" hash="3e27fec1d5be099dca5046a28a727fdf"/><dir name="Extension"><file name="Cell.php" hash="346b7b8d2f65e3c5faf42b4d51d1b9c7"/><file name="ColCount.php" hash="09a4bfb2c1bac823adec42a25c8adfa9"/><file name="Custom.php" hash="6a56ad23ce578d61eadc48d8ebe4feb0"/><file name="RowCount.php" hash="cf73886bfb5624b81a2af882e13e549b"/></dir><file name="ListEntry.php" hash="27a6848cd94c00a940943f82769a1145"/><file name="ListFeed.php" hash="a63c3e4fa5ab0dd657586160c3039bf5"/><file name="ListQuery.php" hash="68810f38c72f7607d13391598da86857"/><file name="SpreadsheetEntry.php" hash="7b72467b4ce9ed1b80662260ce8cfc45"/><file name="SpreadsheetFeed.php" hash="eb00dc6a93b99f7023d99090ea153b67"/><file name="WorksheetEntry.php" hash="e2853a1566332a2d665db290c8b4b675"/><file name="WorksheetFeed.php" hash="040fc68fa4c9cdafdfa09400e75a8c80"/></dir><file name="Spreadsheets.php" hash="ca78f3805cb6e5473451cfe7d6f23766"/><dir name="YouTube"><file name="ActivityEntry.php" hash="c9e55d035b0a980f519d2b4c2f23f82f"/><file name="ActivityFeed.php" hash="53822129c5e6f23f7cd6885ab848dba9"/><file name="CommentEntry.php" hash="6606d6a2bc2c0ec1453944607ad943ed"/><file name="CommentFeed.php" hash="1109541ec5e8317c31babf310192cf50"/><file name="ContactEntry.php" hash="224316e86d1294937bb98d0264561ac3"/><file name="ContactFeed.php" hash="b5391019dffc5b88bdfaf7e5f71e73d3"/><dir name="Extension"><file name="AboutMe.php" hash="9cdce745036e787a9795d48b9338fbef"/><file name="Age.php" hash="790d070c3b7328af6ee2cadc73d5f10c"/><file name="Books.php" hash="8e4654aea6dead0e398875ebbee78bf5"/><file name="Company.php" hash="98995ae6ed1f8153b842838680828ceb"/><file name="Control.php" hash="12ee46b8de21cf6f97cfaf3a88355145"/><file name="CountHint.php" hash="23b7e26968fc3cce6c34e90f1ecd55fa"/><file name="Description.php" hash="8374ae2de0b8a0d3256a22c01822e4ab"/><file name="Duration.php" hash="cf0110795fb16b5db6e594541649174f"/><file name="FirstName.php" hash="6bd01be53f0dbefffcfeda7e51a52753"/><file name="Gender.php" hash="7732f43b2ea22aa536462330d1f55900"/><file name="Hobbies.php" hash="12693d0e9b24108e64d8e40a4cd1cfc1"/><file name="Hometown.php" hash="8e857082ad3491bc602bdc4fb019719b"/><file name="LastName.php" hash="0bd4d3d43975ab1d9466bfd9dea51290"/><file name="Link.php" hash="ff12889bc5b74584d0244eddcc454ee4"/><file name="Location.php" hash="825dc3d5d2abb2404e12441f5bedc827"/><file name="MediaContent.php" hash="34d5f9f3b0e0da30a86c810041bd4e84"/><file name="MediaCredit.php" hash="6bfecc51c2617935cc0a87f32b41e43c"/><file name="MediaGroup.php" hash="1da4ea4d066bd9890574cdc1695212e8"/><file name="MediaRating.php" hash="9788f53341898a70c5628002b9351823"/><file name="Movies.php" hash="f1a99917694ec54ab4113a3fb34ecb92"/><file name="Music.php" hash="24b40b9bb063cd41942fb841e094836f"/><file name="NoEmbed.php" hash="a5f80369a6f05b126edbb196110303e7"/><file name="Occupation.php" hash="f477a18ab686219cf337cea0f029d49a"/><file name="PlaylistId.php" hash="71feee4230f412ac11153d8e5ff8c999"/><file name="PlaylistTitle.php" hash="b3bfaa5b6546a352d074ff393c005053"/><file name="Position.php" hash="19650a6faa37548001f630b58fa52412"/><file name="Private.php" hash="bae311b50f1efad7b91b8f85b181c616"/><file name="QueryString.php" hash="61d800b7c40908a30e4f0a5115626679"/><file name="Racy.php" hash="7b6ee611472c62df46dbf1fcf64dddb0"/><file name="Recorded.php" hash="4fd771d3a447948a511c38261092ca9d"/><file name="Relationship.php" hash="48570fdee3f530b24cb2b8fe2d5681c7"/><file name="ReleaseDate.php" hash="c3695052f4e1af6e2d180aeed95b42a8"/><file name="School.php" hash="c0c626b772486f6aaefe9f85e03a69a3"/><file name="State.php" hash="10acf9978e3f34b60d9df63df8f634fc"/><file name="Statistics.php" hash="41df5367f6fd3002b666316534a61ded"/><file name="Status.php" hash="330417c7711a9cc9b0234ed7e4d001de"/><file name="Token.php" hash="937925a9d852a13d8d065dd3c7a17fce"/><file name="Uploaded.php" hash="5985013055bbe0c770f1088671eaa7ae"/><file name="Username.php" hash="5115291a9f1fd81f30f8eac426c6c8d3"/><file name="VideoId.php" hash="d8338d7cde33a0fae8124c170450d67a"/></dir><file name="InboxEntry.php" hash="0c10b89b84cddfbfdcbbf4cef423dde4"/><file name="InboxFeed.php" hash="10e9bfccb796273a5e217daaa133f368"/><file name="MediaEntry.php" hash="0747a813860ab0540300cfa00ec90f99"/><file name="PlaylistListEntry.php" hash="bc21b4bff916051f43ed0d839266a77f"/><file name="PlaylistListFeed.php" hash="78c8b8fffc302e094567e76b960b0c31"/><file name="PlaylistVideoEntry.php" hash="009b8ca1aae860c3aa50e9df07be3b66"/><file name="PlaylistVideoFeed.php" hash="3a422d2a504014b6e8d2936468655b57"/><file name="SubscriptionEntry.php" hash="ae651e1b77107fd3db6eaa6887e5820a"/><file name="SubscriptionFeed.php" hash="0fd449993846cb075e824f9709273ab2"/><file name="UserProfileEntry.php" hash="d30e11d0afd05656b1e73f6a5dfa5c73"/><file name="VideoEntry.php" hash="9af1c9bea7583511d92fa491ccd9b633"/><file name="VideoFeed.php" hash="02d815599ca9a9ced48909a6f32eb9d0"/><file name="VideoQuery.php" hash="1e47863ccbbdd2bf022ed5bf1d8139fe"/></dir><file name="YouTube.php" hash="3a1c670467f3c1f008b7cff3ef13db67"/></dir><file name="Gdata.php" hash="f3cc45463c7e1428c267cb0ec3a03790"/><dir name="Http"><dir name="Client"><dir name="Adapter"><file name="Curl.php" hash="e00c014b8f505c04fb3ab807ea920f10"/><file name="Exception.php" hash="31eefeebf17273855a424d4adf55dc57"/><file name="Interface.php" hash="d9051a5567fa46be590fc4d81c813f79"/><file name="Proxy.php" hash="e87396e6ebcf087e63ab33f4ee3e5132"/><file name="Socket.php" hash="bc804c920702707a9e4fe9f37b8b3f2e"/><file name="Stream.php" hash="c74a86735fdca13db11a4b8fd411ae4c"/><file name="Test.php" hash="9ee227a0de21cafb4f3b57eaae3b8320"/></dir><file name="Exception.php" hash="88a54c499a048b5fb4e59570b20eba9e"/></dir><file name="Client.php" hash="fec80146cf44ae998200fc143a04ef21"/><file name="Cookie.php" hash="506199d4960083d6ebd834a13d8780ce"/><file name="CookieJar.php" hash="205c6778fb782068832e0f08f1cc2a4b"/><file name="Exception.php" hash="a4c3109b7f888f879575a532572d5e75"/><dir name="Response"><file name="Stream.php" hash="46e2a5d48e480f3b159093eda9df92ab"/></dir><file name="Response.php" hash="0539f26a79ab42d05abb668c434bd413"/><dir name="UserAgent"><file name="AbstractDevice.php" hash="6b900aeab41e3f6c4226181fd747fea8"/><file name="Bot.php" hash="d0b977411437e0bc92dd12e20acaa796"/><file name="Checker.php" hash="f66f2d4912109beb8b9ea32fd776c58e"/><file name="Console.php" hash="20968a62e81c34baeba0c6c8bf7a132e"/><file name="Desktop.php" hash="07ed42f54509fed68a75a7fe18487426"/><file name="Device.php" hash="35e347842cba74f205f4ef26bb7cafcd"/><file name="Email.php" hash="76671455d081accf288d48fca32d352c"/><file name="Exception.php" hash="f5b3057124b279c1a4ba25318dd1f4af"/><dir name="Features"><dir name="Adapter"><file name="DeviceAtlas.php" hash="20791a96dc0f031ff6cd7cc74ae80b60"/><file name="TeraWurfl.php" hash="d19f0e60f99e06cc3df08857bb8d09a9"/><file name="WurflApi.php" hash="fe9305f51175e9fa3da4e773238d9064"/></dir><file name="Adapter.php" hash="fae56b3d3a2d089eebef8781cbb68b64"/><file name="Exception.php" hash="ea6cda51ad1955f0e81013e0bdbae66e"/></dir><file name="Feed.php" hash="756b34d6715f0e56ad0b41d4add03459"/><file name="Mobile.php" hash="c0a417e4e8e959dced0865bc98938bc5"/><file name="Offline.php" hash="dd178a2c506256daa005b810d48a8b85"/><file name="Probe.php" hash="c99048d8103dc3b222f2353bba28ae98"/><file name="Spam.php" hash="fabc4c5744352609b8ff5acf32013872"/><dir name="Storage"><file name="Exception.php" hash="4fb3355e2f8a93b3457d408a87739fd8"/><file name="NonPersistent.php" hash="dc9d8905d56892785c6624763fead83d"/><file name="Session.php" hash="fca52f9ce3175e4ab8fe4eee54927d61"/></dir><file name="Storage.php" hash="9f90a61da3e30f1e23166ab57e7ac30c"/><file name="Text.php" hash="084892517ace67b081ee38b9067724b3"/><file name="Validator.php" hash="d857cf5f000f33afdfcbfffc67864195"/></dir><file name="UserAgent.php" hash="6bae819a64905b348577f51ad406a070"/></dir><dir name="InfoCard"><dir name="Adapter"><file name="Default.php" hash="566b2a8d9279da141ab1ec6051794ddd"/><file name="Exception.php" hash="38c7be31002fe0013c11b14d3edf6cb9"/><file name="Interface.php" hash="7b17670f540ee37492a60108431a6580"/></dir><dir name="Cipher"><file name="Exception.php" hash="e176c3c495ca04ba198c54f679108052"/><dir name="Pki"><dir name="Adapter"><file name="Abstract.php" hash="b530e303b82ee8fbe6a0703f352e64bc"/><file name="Rsa.php" hash="b0ed76dd0371c19991ffa91af938c753"/></dir><file name="Interface.php" hash="0acb5d79523db6315a0365738683ab1c"/><dir name="Rsa"><file name="Interface.php" hash="87b7b084b3b73938516e1baaeff35b6e"/></dir></dir><dir name="Symmetric"><dir name="Adapter"><file name="Abstract.php" hash="2c01c1c89d33a6652f8818e5370bd07d"/><file name="Aes128cbc.php" hash="ab1df28a3efe46e614a1ae8bf27c48a2"/><file name="Aes256cbc.php" hash="33e3da15c3de84b460853b0fad2cf7d4"/></dir><dir name="Aes128cbc"><file name="Interface.php" hash="075cd79511608f251f83226d14acf887"/></dir><dir name="Aes256cbc"><file name="Interface.php" hash="d38e17a8347031b93c03012cb127cf6c"/></dir><file name="Interface.php" hash="7b6f42afc7a6e87c2fcd063f9d0410d0"/></dir></dir><file name="Cipher.php" hash="31cc4dacfe67f6ff29144f1289fb526a"/><file name="Claims.php" hash="1dacb6bfe1204eee411cb8f83690da99"/><file name="Exception.php" hash="cccc2408c4f92b00d7e28b73db59608e"/><dir name="Xml"><dir name="Assertion"><file name="Interface.php" hash="475c4f340ea70909cedea7cec9f32b6a"/><file name="Saml.php" hash="c0be6fc3f10025c109e11ceece362422"/></dir><file name="Assertion.php" hash="ebd4131310800daf474e8562e0711761"/><dir name="Element"><file name="Interface.php" hash="0c1989eaf63f330160211e78fb0197ef"/></dir><file name="Element.php" hash="235720d35530fa4fdcc6c6b1b001a4d2"/><dir name="EncryptedData"><file name="Abstract.php" hash="28364d1925a6013ee70e9b0baa3f684a"/><file name="XmlEnc.php" hash="f1710c7946273b1613f1d06760d6955c"/></dir><file name="EncryptedData.php" hash="d88b2e452c797bd952d6d80db6a1293e"/><file name="EncryptedKey.php" hash="9c3d4710cc09eac60199170a7d22d497"/><file name="Exception.php" hash="c2ac2b1ab255ca029b1b6d6bd2370d00"/><dir name="KeyInfo"><file name="Abstract.php" hash="26f29a81d5524ddcebb4e3b4e023997f"/><file name="Default.php" hash="38b0f246fd11220487cb3cf8b33d5357"/><file name="Interface.php" hash="5849c079546412622d571e22012cb0f0"/><file name="XmlDSig.php" hash="fecb94ca285cbc485f565c0e7210722b"/></dir><file name="KeyInfo.php" hash="d5201628345bb5d8d6af6606b3c45dcf"/><dir name="Security"><file name="Exception.php" hash="e5aa0ef990b216134a4a430cc345dc0f"/><dir name="Transform"><file name="EnvelopedSignature.php" hash="557051ecc03827e0e72a7b531165ec85"/><file name="Exception.php" hash="f41545989ab999447bc5feda4112db0f"/><file name="Interface.php" hash="50ac5fff0249afca49a95a7713c2f8fb"/><file name="XmlExcC14N.php" hash="7cdc9388b1ec80077f73296c8244cd22"/></dir><file name="Transform.php" hash="54441e724b9499f315a927b0c294e338"/></dir><file name="Security.php" hash="975eab753a24cb850e18e0d6212f2d2f"/><file name="SecurityTokenReference.php" hash="da74bd834d439ffbddc6d0937f79cace"/></dir></dir><file name="InfoCard.php" hash="f6ecace117d0b6176841aa550c9dea57"/><dir name="Json"><file name="Decoder.php" hash="479f9f8662fb2d55c25bca35b24b1fd7"/><file name="Encoder.php" hash="50923a3bcb5ca06a185b6e23e12fc960"/><file name="Exception.php" hash="21f022ea1a2f3ddb87f9bc76f535584a"/><file name="Expr.php" hash="7a40039b5e3100725a598ae4bf7c60cd"/><dir name="Server"><file name="Cache.php" hash="95a49f7e5ce030ba873935bec9fe0168"/><file name="Error.php" hash="91a908c934be84fc668cd2ef36c34581"/><file name="Exception.php" hash="d8e9014659d3a538b15d08583c69403d"/><dir name="Request"><file name="Http.php" hash="71b33be3eb3ed255fdbb73fa92cfc18f"/></dir><file name="Request.php" hash="252793cef17af1d2bbf1e94956e5c5b4"/><dir name="Response"><file name="Http.php" hash="79866a6a7b95acd0bfdcf27b58c48bbb"/></dir><file name="Response.php" hash="b38e34c941ffc23cf035ccaf38a492df"/><dir name="Smd"><file name="Service.php" hash="01c05c3f005f6ba57d1d64d76fd896a7"/></dir><file name="Smd.php" hash="bf240453d7bd6dd560a04c2e4ca050e7"/></dir><file name="Server.php" hash="99140f7251f6545724f825634182fb94"/></dir><file name="Json.php" hash="b93028406dff8e04a12c94e3df2c77d9"/><dir name="Layout"><dir name="Controller"><dir name="Action"><dir name="Helper"><file name="Layout.php" hash="5e0f6b18922337be357c37d05a1e9e0d"/></dir></dir><dir name="Plugin"><file name="Layout.php" hash="7ad77c317f030c01db4c291bbfdccd2d"/></dir></dir><file name="Exception.php" hash="b807f86002b55376e08e934180f3faea"/></dir><file name="Layout.php" hash="92bf54e6ce6a4b264533b76a489bb562"/><dir name="Ldap"><file name="Attribute.php" hash="8d60280dbeb289b9a368c33e22028990"/><dir name="Collection"><dir name="Iterator"><file name="Default.php" hash="48ee994852d7e674e6daf6fc1ba6714e"/></dir></dir><file name="Collection.php" hash="dd98277038d69a92ccdbad33d7f15bb5"/><dir name="Converter"><file name="Exception.php" hash="53f7e8a229ed7edd6f84a9cfdf0e5e6a"/></dir><file name="Converter.php" hash="525052550b8a3db306df229a47c54a27"/><file name="Dn.php" hash="9f13e3d75d72dcbc3101375af8b4b8c9"/><file name="Exception.php" hash="f7d0cd85b84ec4b44dde255c7149f282"/><dir name="Filter"><file name="Abstract.php" hash="3b93241eea8ce5688875f4fbb5ed22fd"/><file name="And.php" hash="32b9802fb83252458950a69f60670c71"/><file name="Exception.php" hash="d28d6127c16df47f068000e5bb27b02f"/><file name="Logical.php" hash="7d54024ee3b97aa2c0feaa886149019c"/><file name="Mask.php" hash="6a62636c33045626e901018cd06d3256"/><file name="Not.php" hash="4f63e011d588803198113057aa4de45b"/><file name="Or.php" hash="349c53117049398cf9d6e3b1aefe6d11"/><file name="String.php" hash="bc4dfc2adefca4ce3ff2c8c393329496"/></dir><file name="Filter.php" hash="8f7ae41d6bf9ead94aa6c78275f35c5e"/><dir name="Ldif"><file name="Encoder.php" hash="d2d22b774d7888f3a64f466142265863"/></dir><dir name="Node"><file name="Abstract.php" hash="c895de62c4499d74091f6dce7700bb1a"/><file name="ChildrenIterator.php" hash="98bee8d74512d5163fb5e69667a6e9ba"/><file name="Collection.php" hash="f5465481cd6db2871d57648e726670e9"/><dir name="RootDse"><file name="ActiveDirectory.php" hash="3fd256c329cf83f8cdd9c8713a25f7bd"/><file name="OpenLdap.php" hash="d214d5cd1cb69def31af15753897f365"/><file name="eDirectory.php" hash="c8d35daf766f691afc43459df25ece3d"/></dir><file name="RootDse.php" hash="c6dd0caf5adee1e5aacc1a110ec1c629"/><dir name="Schema"><file name="ActiveDirectory.php" hash="a993a274c908b156587b25759768cf33"/><dir name="AttributeType"><file name="ActiveDirectory.php" hash="59d57df8716816aa60b79db89fe16674"/><file name="Interface.php" hash="bb6bee8b6026c1a984a9a83cfeacfe67"/><file name="OpenLdap.php" hash="0f2fe5001003717a847a91ab8e03fddd"/></dir><file name="Item.php" hash="5fc1550226091482a6163b2bcf073c29"/><dir name="ObjectClass"><file name="ActiveDirectory.php" hash="b05f1316b63b99eec468288ce98a5925"/><file name="Interface.php" hash="97c93bda8eaa03b6a0e2c476a37b33e9"/><file name="OpenLdap.php" hash="4495a48a150f09fdb9464ed47d28db64"/></dir><file name="OpenLdap.php" hash="984e4efe82d0f3e3dd621807bd599bec"/></dir><file name="Schema.php" hash="36fa6dc811a21fd57fb7d42f8c9d1d71"/></dir><file name="Node.php" hash="8af1870e9797334c3df6e598a22f6afa"/></dir><file name="Ldap.php" hash="8637cfbabb8a7c05583625aa7cc36f27"/><dir name="Loader"><dir name="Autoloader"><file name="Interface.php" hash="5fab576de3490df446180b64762e7376"/><file name="Resource.php" hash="1684a317d3d0849e35de4a901443e890"/></dir><file name="Autoloader.php" hash="2056cbb051a7d0d3d80d4eb33002f8d9"/><file name="Exception.php" hash="c5fc54a6a9a3d029db7f5b82fa64ecdc"/><dir name="PluginLoader"><file name="Exception.php" hash="5b355b4ba8e24aeb9df7266a2847314d"/><file name="Interface.php" hash="76720deb90f2ef24d23a304cc7b96e64"/></dir><file name="PluginLoader.php" hash="8952c4a4a08ac71e8041ee91b12ff6d4"/></dir><file name="Loader.php" hash="5e4a95762f945d6a660cd9dbe6b4f39e"/><dir name="Log"><file name="Exception.php" hash="f02cb119e53cc50677396ed6db247364"/><file name="FactoryInterface.php" hash="18060882c6bfcb8b992455172f5f8b59"/><dir name="Filter"><file name="Abstract.php" hash="980ad53d797e78797b4321ca2074901c"/><file name="Interface.php" hash="d59401f6c39879e0137802ee0f43fd28"/><file name="Message.php" hash="e70724419b8246223a3b5f7ed5edc62d"/><file name="Priority.php" hash="aab736aad10e0b685647a725d59c705e"/><file name="Suppress.php" hash="4efbec6ac26f2abf6a0f96b45bea37c8"/></dir><dir name="Formatter"><file name="Firebug.php" hash="2b2b96c94fcb2f40eb7d50a8116508ea"/><file name="Interface.php" hash="ef3f3e5016ab000d429b0556d758aefe"/><file name="Simple.php" hash="54b1c4cdd2bc7e026f31199be65f03d5"/><file name="Xml.php" hash="228735c6f5524b62e921214c6746f35a"/></dir><dir name="Writer"><file name="Abstract.php" hash="63dbb11e0009e868f6833b1bde830d98"/><file name="Db.php" hash="8004a2b9014a8706e4144e9aa40b3989"/><file name="Firebug.php" hash="4eefc2805b939c1518be4de83ede0216"/><file name="Mail.php" hash="55fd43aec0a637a36704289d7b52e300"/><file name="Mock.php" hash="3a9d4d04148f4b89ccff9c8fbc0cf25b"/><file name="Null.php" hash="66e303b83fde02151dc330637cd0a62a"/><file name="Stream.php" hash="b3afe3d49aa7ae4bc4f5497049507d31"/><file name="Syslog.php" hash="55a879eff24fab333f8c6234b37f36e8"/><file name="ZendMonitor.php" hash="5cba424e0504ff3dfae58adf9d93ae79"/></dir></dir><file name="Log.php" hash="ee97c68399b3798f0a114b0c49440293"/><dir name="Mail"><file name="Exception.php" hash="f8e12ece0c772a118a08006697981e88"/><dir name="Message"><file name="File.php" hash="0dce23be9bb61178914265c8052b7460"/><file name="Interface.php" hash="51c523a3c2359ded2a2ec3cf9bd05a7b"/></dir><file name="Message.php" hash="f2c27c033e81944d59cbec8aa42db1af"/><dir name="Part"><file name="File.php" hash="02681a5b92d0286c4f2da4274d99b89e"/><file name="Interface.php" hash="369d3ca5fd9763f5769d7de6516e9faa"/></dir><file name="Part.php" hash="2b0c7b9c62f98638de6aa2d8cb2e2d98"/><dir name="Protocol"><file name="Abstract.php" hash="80d563aa159e0b9cbbd75dfe4913b051"/><file name="Exception.php" hash="c668da255f4ed51cda2a24b59ce7eb85"/><file name="Imap.php" hash="d79c4717ef8ea46e792865e55d00bffd"/><file name="Pop3.php" hash="57c373d462007f4a9b5ca3ee24945b94"/><dir name="Smtp"><dir name="Auth"><file name="Crammd5.php" hash="ab53e7637974ffd639a5bed65d651512"/><file name="Login.php" hash="9c011eab6f4b20ecfc58222a977bf768"/><file name="Plain.php" hash="066e8ed790f5e11fade03411fd2b429b"/></dir></dir><file name="Smtp.php" hash="d92840664d0bdfc249922fb89af2c65e"/></dir><dir name="Storage"><file name="Abstract.php" hash="b03d89312189ef658f38cb6ef5241c57"/><file name="Exception.php" hash="5e4bea1995506e3f14994c78d756452d"/><dir name="Folder"><file name="Interface.php" hash="3bb18d3e6c9c59a26a6217b17a7af9e6"/><file name="Maildir.php" hash="5646e345f00a86d9f529da5b36e1ed26"/><file name="Mbox.php" hash="6cdf1a59c99d3b4aea8ad648445ddb18"/></dir><file name="Folder.php" hash="2b80fffb54e66f12b2cc4bd10893cd6b"/><file name="Imap.php" hash="c207248c8c95eb57ec48d5b90684d63b"/><file name="Maildir.php" hash="397ff1fc71ef51079c9dee93c10a9953"/><file name="Mbox.php" hash="4e80328dc434559212e30a93f3199e14"/><file name="Pop3.php" hash="11bb6f72d27f1eb2e4756608ac231576"/><dir name="Writable"><file name="Interface.php" hash="3c25392d4402e0b6926e2b44badb9c5d"/><file name="Maildir.php" hash="b779004de39c1d4236492a96e7d38f74"/></dir></dir><file name="Storage.php" hash="03278fc22648640e81af5ad2f802cb93"/><dir name="Transport"><file name="Abstract.php" hash="2b7161fd7d579c9bfd83d82a6aea5d6b"/><file name="Exception.php" hash="b71c3d32b4467618a58a426bb01abb53"/><file name="File.php" hash="c5cb28a83303f3ad22b01e199fbb2818"/><file name="Sendmail.php" hash="a2f169b9cfcb176b11390b194dd1d194"/><file name="Smtp.php" hash="d2c9680fbcf5b52696d25d8fbf32a7e8"/></dir></dir><file name="Mail.php" hash="ae68266e51f30124a545c4cc80b1cff2"/><dir name="Markup"><file name="Exception.php" hash="9c73460f187a374cf40ded1676a664bd"/><dir name="Parser"><file name="Bbcode.php" hash="989a3fb3b9f5f61a808da073142ab0ea"/><file name="Exception.php" hash="815fc188d5cd5148baa463eb9e29d660"/><file name="ParserInterface.php" hash="9264af16622d2e24c8943a9ae80941fc"/><file name="Textile.php" hash="54752be62c7b1b46e47230b2288df30c"/></dir><dir name="Renderer"><file name="Exception.php" hash="b0839cf0b41ab7a3606fb8aa6b0bb2e3"/><dir name="Html"><file name="Code.php" hash="6fef65c2e973dbebe3d84d2bbb94716d"/><file name="HtmlAbstract.php" hash="77d6f68abfc7a8ccde36d163014e8030"/><file name="Img.php" hash="1408ae96f2d576740d9de0be8913d697"/><file name="List.php" hash="f63b73c4228973bf60ef1d9e3a5ea022"/><file name="Url.php" hash="4d7568640cd7b24ad6349c1b7b3d0118"/></dir><file name="Html.php" hash="ca83713fa0f62a6b70877900f12ab783"/><file name="RendererAbstract.php" hash="fa85f0d36b7f82f50a0fd4077368f552"/><file name="TokenConverterInterface.php" hash="c93d289a48bac4aaf18a4159b5e27837"/></dir><file name="Token.php" hash="47b8f88a81042d5f2cf91c834aa7b855"/><file name="TokenList.php" hash="73e5cecf1ef8cf72fcce77525738193b"/></dir><file name="Markup.php" hash="5ac0ab2a6c07802d83fa765326ca1ff4"/><dir name="Measure"><file name="Abstract.php" hash="a762991cbc21d3d5ca087b4c04e1e1db"/><file name="Acceleration.php" hash="da109aa3f7f96b5d7eb9b951fb475dce"/><file name="Angle.php" hash="72e52890886578eb71f9195a1377415c"/><file name="Area.php" hash="3ae5968c1ada1b6075cee4ad94349ca3"/><file name="Binary.php" hash="4e61e1c8336925baa7374e4f80a9a138"/><file name="Capacitance.php" hash="5bc0607398d1d9661b3fb8a99818c40e"/><dir name="Cooking"><file name="Volume.php" hash="7a407f821ee5a3528ea0c010bc9836a0"/><file name="Weight.php" hash="96ef7a1b9deae03cae63d05165a5b778"/></dir><file name="Current.php" hash="43b7d5b3a170af74a24b94a52c3c8d5a"/><file name="Density.php" hash="74bb1f1c5fba75c185fc9e68797f5a3d"/><file name="Energy.php" hash="9882a7e412123bef16b11c429d8f5ccb"/><file name="Exception.php" hash="4aead28b3afbac9c02effed3cc56035d"/><dir name="Flow"><file name="Mass.php" hash="7b1924344b07b19cdf404ddde0146860"/><file name="Mole.php" hash="1825927a95852ee7b4554db75d7d8eab"/><file name="Volume.php" hash="59f31fd02cb58364b525570728dab8f4"/></dir><file name="Force.php" hash="7fc8f4d7a8169749c1e3e4f930e2ab5a"/><file name="Frequency.php" hash="27d4ab164ac967cc9bff9d20a187def8"/><file name="Illumination.php" hash="467d03924f148c355ed158c9f827c4d1"/><file name="Length.php" hash="e3ec2e5ecaeef8529b81b19637c2de89"/><file name="Lightness.php" hash="f3f5a7832039d3d46e9c0d878423986e"/><file name="Number.php" hash="7e84d31164e7d393151cd6e26926f763"/><file name="Power.php" hash="d81944131df8d21030c0752debd67e97"/><file name="Pressure.php" hash="412bb8e34e073044d5d9a9183756616e"/><file name="Speed.php" hash="0f6000878620c301c196ecceabdd9481"/><file name="Temperature.php" hash="e89a2889cfe85e14904d896708ce3143"/><file name="Time.php" hash="526cad3e9a85b132ac0ba015fd509997"/><file name="Torque.php" hash="9bb70eb8eb6bd8664b8b4f8b6a983532"/><dir name="Viscosity"><file name="Dynamic.php" hash="51acb59484603b02e94e28bb1e53d6f4"/><file name="Kinematic.php" hash="0133a097e35bc73a71e6198d632e7e1e"/></dir><file name="Volume.php" hash="f547d5e3ab95ed1b86af21e9610f2b81"/><file name="Weight.php" hash="34cc07cc6c6234dd9006f52fc3fd7310"/></dir><dir name="Memory"><file name="AccessController.php" hash="9e3613f15fdd3239ed029672d07a6264"/><dir name="Container"><file name="Interface.php" hash="a583cedfa36fd083899bca9609eb6805"/><file name="Locked.php" hash="10f769d796e852ac5f5544b679b1b9cc"/><file name="Movable.php" hash="337f3017fec94385c0f8d15bfa4fc427"/></dir><file name="Container.php" hash="fe68edf51c189f5b58af153f8ada548c"/><file name="Exception.php" hash="7868c8606fcee0b9ec80873eb7031f29"/><file name="Manager.php" hash="f0a4050432bb0a51a846db9d3cf44f3c"/><file name="Value.php" hash="7fa1d907e8b5ec9b03fcb9e3115ecc6d"/></dir><file name="Memory.php" hash="6b2758a39bf8edd93d35978dc7b8a718"/><dir name="Mime"><file name="Decode.php" hash="74494e674a59b25ea3e52a5f0d20f16e"/><file name="Exception.php" hash="f0791cdd4d6d8d31115cdde04cfd019c"/><file name="Message.php" hash="ee34a992de48e42a813df20b4d117dc0"/><file name="Part.php" hash="8aae863aad622524d70fbfecd453dec4"/></dir><file name="Mime.php" hash="59b07d53b02a489f6f86df75d3b3f560"/><dir name="Navigation"><file name="Container.php" hash="6feb2231a633dadb2f08595058a25eee"/><file name="Exception.php" hash="68819a5f6324065c4b912daed4cbaf82"/><dir name="Page"><file name="Mvc.php" hash="abed3a79fce494481749f30e3acf3517"/><file name="Uri.php" hash="7eb08dfd195215179303707551753856"/></dir><file name="Page.php" hash="baba78bac1f6e08b1ca6284ae23a3606"/></dir><file name="Navigation.php" hash="d89af0f423253775dbd42a68c9deab0e"/><dir name="Oauth"><file name="Client.php" hash="422a799bb8fc6b42a978031a71fe7785"/><dir name="Config"><file name="ConfigInterface.php" hash="d2cea8ae9a90afa52e04be270cae7848"/></dir><file name="Config.php" hash="bfa4cb262a7425b1b8f6dca22f753522"/><file name="Consumer.php" hash="adf851d4ae7c6285b651c24e8a5f089d"/><file name="Exception.php" hash="f8c5108550717002db0883caab1e1184"/><dir name="Http"><file name="AccessToken.php" hash="20df4ba021fc6be933c12ac8b247a838"/><file name="RequestToken.php" hash="8df9a0676cc70635211fdac26ddd3cb9"/><file name="UserAuthorization.php" hash="a3b5c97304e6a2547d27da660af541ad"/><file name="Utility.php" hash="93fe264c7cf55432bb17b86d12cd8b02"/></dir><file name="Http.php" hash="3cc02170ea759c60f23c374ed3e6d2e5"/><dir name="Signature"><file name="Hmac.php" hash="7115d17174762eb8c886e0730c1c6d5c"/><file name="Plaintext.php" hash="4702c913fe685d0050d41ece8157e8e7"/><file name="Rsa.php" hash="070606b70e98e08c4654073ba744acfb"/><file name="SignatureAbstract.php" hash="0c186e579c65fcd10918ccc0d94c0c10"/></dir><dir name="Token"><file name="Access.php" hash="a6e47b9bcf118e3bac80bc410d31f5c3"/><file name="AuthorizedRequest.php" hash="afc76289f11e815856d10d885cb312f4"/><file name="Request.php" hash="dbf705e70641ce99a74ec39e16a7b487"/></dir><file name="Token.php" hash="6f0915f953510a8dea03e7b7b0cf39d3"/></dir><file name="Oauth.php" hash="131d4d96ea17d1150ef9c6a1554a7ec7"/><dir name="OpenId"><dir name="Consumer"><dir name="Storage"><file name="File.php" hash="53399f068fae3f93cc1c77844a97e95d"/></dir><file name="Storage.php" hash="c09ed474fe9952a81b71f4f793b569ed"/></dir><file name="Consumer.php" hash="212ad217f36442c9e02a3acfbf963e60"/><file name="Exception.php" hash="3f2f2c261c7abc49f8db76ecbf49973d"/><dir name="Extension"><file name="Sreg.php" hash="aadd77b9f078a755f07640c846589856"/></dir><file name="Extension.php" hash="f1cc1f9fa721b497f6b050035004e7bb"/><dir name="Provider"><dir name="Storage"><file name="File.php" hash="725055f25e98bdb9c6dc8a272bc29307"/></dir><file name="Storage.php" hash="7ee7aab5ed5c4abde3d5f8046b143153"/><dir name="User"><file name="Session.php" hash="db3623956f499fac9cdd96dcdc20845d"/></dir><file name="User.php" hash="9f41d175bf6eab232f4a9e0458d3afea"/></dir><file name="Provider.php" hash="3ad7ed852d94618a0380968036fa81cb"/></dir><file name="OpenId.php" hash="0c84845e0345c4e2ba0351c0fd59acee"/><dir name="Paginator"><dir name="Adapter"><file name="Array.php" hash="b409da829f9986f0a10000d5c7a2e2ef"/><file name="DbSelect.php" hash="262b9af7af95fd4a11b3e3f2fad8deef"/><file name="DbTableSelect.php" hash="8aa1af84f75b8b2e51458cd54b5282f2"/><file name="Interface.php" hash="2e292f9a1f769602c034a418809b9836"/><file name="Iterator.php" hash="7848608bd7d5e8346ce47ba739d97109"/><file name="Null.php" hash="357da23386e38dbf0796bb488df60050"/></dir><file name="AdapterAggregate.php" hash="a60ddf7bf5063bcf5cf3e476a52abb52"/><file name="Exception.php" hash="2005d7a7501f52b66b5abe4d38a48ecc"/><dir name="ScrollingStyle"><file name="All.php" hash="da36f53ec0140d140e50bb3eec4879e5"/><file name="Elastic.php" hash="6f73fd119df054a9df1f6c62feb8cd78"/><file name="Interface.php" hash="60b3d9c3019bea13d2a4c14d09477c87"/><file name="Jumping.php" hash="2af23cc666bc69aabd3022a4187276d9"/><file name="Sliding.php" hash="f324dae0ec9b7f12ea189e90ec2e864d"/></dir><file name="SerializableLimitIterator.php" hash="da46c67ec94c1354abf7eb6416367707"/></dir><file name="Paginator.php" hash="b08e1e81381dc3f3312e8a104cc94bd6"/><dir name="Pdf"><dir name="Action"><file name="GoTo.php" hash="a46084e6b40ca15a42bbdd9975bc5c63"/><file name="GoTo3DView.php" hash="8679b602686c69708eafdae6a03539ae"/><file name="GoToE.php" hash="aef379c2332b841d14de841eb459699e"/><file name="GoToR.php" hash="e0d26342534d50e7be5e828eda1c3458"/><file name="Hide.php" hash="d2f936e6800474226ef2bb9c2cae6866"/><file name="ImportData.php" hash="ebc217ae2fa14ac947822084b1b9c259"/><file name="JavaScript.php" hash="99acba666477b97d75b494e828ca0243"/><file name="Launch.php" hash="0c01a28f861a7dac515037a42be78b16"/><file name="Movie.php" hash="22ca38cf540df7b7f22d3d30cd4b2234"/><file name="Named.php" hash="1c226f992598430675093cda97d723fe"/><file name="Rendition.php" hash="3b5240b33a5ca291a5c5468a33802185"/><file name="ResetForm.php" hash="93c52f60e4754e8ac0758ad37a872628"/><file name="SetOCGState.php" hash="2886ce2ee3c6bfb01b42e16b7eae7860"/><file name="Sound.php" hash="c8bfda471cd026089064857dcbe01406"/><file name="SubmitForm.php" hash="febf29787c2ed38253a353e11513e129"/><file name="Thread.php" hash="01be4dcf2f93f8b2abfeb028f24c66be"/><file name="Trans.php" hash="f8702d1916fffa24e8bd265e45e1882a"/><file name="URI.php" hash="8842939cbfc08515b5c0ddb992dba9a0"/><file name="Unknown.php" hash="13d8be70d339bf5ccb503932376a869e"/></dir><file name="Action.php" hash="2589e2b606dadd34d6f5a0786300afcb"/><dir name="Annotation"><file name="FileAttachment.php" hash="00e26f4630f36380236cdfb0d78f8d5a"/><file name="Link.php" hash="4cc79fcdd483f1755a9accd361d589b9"/><file name="Markup.php" hash="9e0011325c3faaee97869a5f0c7b0d76"/><file name="Text.php" hash="38a481fbabb8ca3448a63f68871088b5"/></dir><file name="Annotation.php" hash="06cbd06986bbb11f8b216e3fe8c9ae19"/><dir name="Canvas"><file name="Abstract.php" hash="47904ed3f83cfaf210f29c170c79d8f7"/><file name="Interface.php" hash="9d3688d1f96dab087f0cd6c3f0753ee4"/></dir><file name="Canvas.php" hash="12f4bdc9cd60aef9611720f4116d5020"/><dir name="Cmap"><dir name="ByteEncoding"><file name="Static.php" hash="c56df36059d2cd39410471ff01c5314b"/></dir><file name="ByteEncoding.php" hash="7ca562630dcb7969fb22bdebeba16735"/><file name="SegmentToDelta.php" hash="f77309709ea83fbe2199883807524912"/><file name="TrimmedTable.php" hash="6e2670f1099929b931380f643ff6ef38"/></dir><file name="Cmap.php" hash="9325c175b2d62145a4d0bc88975a62e8"/><dir name="Color"><file name="Cmyk.php" hash="328607cb5d77321c6ec23539acda40f2"/><file name="GrayScale.php" hash="38479c9b8ee83ea274ca94a2fe7e78ee"/><file name="Html.php" hash="231ad44ce96d54d700176d871f56e5ba"/><file name="Rgb.php" hash="2316b60efd228b769a6ff0e9a86a0f82"/></dir><file name="Color.php" hash="1043c94cdd7f4f9fec67a413983ef736"/><dir name="Destination"><file name="Explicit.php" hash="73d2fb0a8f7b0080b2dc8e029b14cc83"/><file name="Fit.php" hash="2a350e420446c4fc50856971d3c7c4b9"/><file name="FitBoundingBox.php" hash="92d591eeb215ab32bd8b52af398e1786"/><file name="FitBoundingBoxHorizontally.php" hash="93e782bbbdba1e5c66a794b0391d1de1"/><file name="FitBoundingBoxVertically.php" hash="9b70a7594cd2e62e0d46073bdd82f422"/><file name="FitHorizontally.php" hash="0d617ae3e1bde056a8370294c7ba0b97"/><file name="FitRectangle.php" hash="ef44f1154578649017b17955ca98ef4f"/><file name="FitVertically.php" hash="99e192ea1cd43cc3ed52d0cd12f2d1c8"/><file name="Named.php" hash="e2db7b0f3d687fb222879a66c3456d8a"/><file name="Unknown.php" hash="21927e2657e4708828fde8b722e9b3dd"/><file name="Zoom.php" hash="72e046ad69f3253d4640f94c702ad67f"/></dir><file name="Destination.php" hash="63e54d1a56f98d4c20c4465bf8a09abb"/><dir name="Element"><file name="Array.php" hash="3783483d4fd819c4cbb9cc404f01ce4b"/><file name="Boolean.php" hash="dcc5b9639f2588cf51e190b5941823da"/><file name="Dictionary.php" hash="cb6924bb28b7f2aefc3e34e0b4694f50"/><file name="Name.php" hash="ddcbdd92fb1443aee9fb5edfe95e82a6"/><file name="Null.php" hash="6ebd8b40ddc59741e229dec2d1636de6"/><file name="Numeric.php" hash="03651e2ba58d9b082d0703ebdb3d9f41"/><dir name="Object"><file name="Stream.php" hash="be968324d29f91d6b1da1adb109db99a"/></dir><file name="Object.php" hash="06ecbfacdb6800c1118a82a6f11ed3de"/><dir name="Reference"><file name="Context.php" hash="51a539061d35c5f35ad4f7659e596b88"/><file name="Table.php" hash="0c745ed15c414cf9be855985c6e4a634"/></dir><file name="Reference.php" hash="f8aefdc6c7756f38153eb6a3b4f03059"/><file name="Stream.php" hash="70cb6f5fd33e2fe175864626de5e5cf7"/><dir name="String"><file name="Binary.php" hash="2c0a16ffa76c43d7952946c37b057b85"/></dir><file name="String.php" hash="73fe1bbf32c2c00be8906d6b290dc7fa"/></dir><file name="Element.php" hash="9fb0b9a50be9059f42ccb48b3b32b235"/><dir name="ElementFactory"><file name="Interface.php" hash="c97e4a541ec7322d7307f375fa596b0f"/><file name="Proxy.php" hash="833044278440e0d0934aee74347c58aa"/></dir><file name="ElementFactory.php" hash="be2ab1addc83a968a456e5f9f0797ab8"/><file name="Exception.php" hash="1732f625db014557b7a2fcd59570534b"/><dir name="FileParser"><dir name="Font"><dir name="OpenType"><file name="TrueType.php" hash="e50f228019184c4bc6a6dcf7f5bb7a08"/></dir><file name="OpenType.php" hash="16a6103122d4420efe36b4357a804287"/></dir><file name="Font.php" hash="abe06d8ba7f65d9aa10749dfaf4e41a9"/><dir name="Image"><file name="Png.php" hash="b7fc4bd65ccfa580e500db20983edc9e"/></dir><file name="Image.php" hash="00893cdc1724e9357d59cc29cae95610"/></dir><file name="FileParser.php" hash="4f4dee9d5462570fdc341ab61adb4065"/><dir name="FileParserDataSource"><file name="File.php" hash="8e425dff4723dde2bcc31199c2b3742e"/><file name="String.php" hash="d2d3b41774bdd1971e7dd5670e9c25c5"/></dir><file name="FileParserDataSource.php" hash="40da36d9c0d370a8649ee13d0b99cdc5"/><dir name="Filter"><file name="Ascii85.php" hash="64c2b85eba54fda9c96e133fc9e0c391"/><file name="AsciiHex.php" hash="7d44025e6d5cbc12b84553e1d040821f"/><dir name="Compression"><file name="Flate.php" hash="9758326da87d7eeec016ed0e976eee90"/><file name="Lzw.php" hash="7c0d4a202366a9d572ad6f055a386e82"/></dir><file name="Compression.php" hash="13d96f3d6751ca443d986752c48ba473"/><file name="Interface.php" hash="13612337c5e1df2fd6ed0fd99cb4f263"/><file name="RunLength.php" hash="ca6b06b2ec43e6d17ed87b23d6775d18"/></dir><file name="Font.php" hash="a258d468e4425837c8e63c0146db6525"/><file name="Image.php" hash="e86196834d8209995ad93422fc5e72bb"/><file name="NameTree.php" hash="3db70da0459a7f76c2dfc0fb0049f772"/><dir name="Outline"><file name="Created.php" hash="7121ffa37333a3283af25feabb62f203"/><file name="Loaded.php" hash="f9e202f805a9d5c46c90efdecc27d3bf"/></dir><file name="Outline.php" hash="b38e229fd7112017bb82535f0f1529fc"/><file name="Page.php" hash="b7047c0e0623e72d83bd6991b03a7fef"/><file name="Parser.php" hash="016193eca516347fb3055e2395d311c1"/><file name="RecursivelyIteratableObjectsContainer.php" hash="6ba4754bf45d3c77ce806efae87d4567"/><dir name="Resource"><file name="ContentStream.php" hash="1d31f5b698489e3a835313f125d4d9dc"/><file name="Extractor.php" hash="254491e06b8c70e9d2e29290bdc633fe"/><dir name="Font"><dir name="CidFont"><file name="TrueType.php" hash="516886b5cd0be26d843b021b57f138c0"/></dir><file name="CidFont.php" hash="d9594ba6e9fd4886aec3ad3c222beaed"/><file name="Extracted.php" hash="4f22964eac12efee973f5de27c95c6c4"/><file name="FontDescriptor.php" hash="51603d027bca4e4c7cc19f8be8d480cb"/><dir name="Simple"><dir name="Parsed"><file name="TrueType.php" hash="2d6285d8fd18b9f686d7921af57fa1b5"/></dir><file name="Parsed.php" hash="9df46b4bbdb1c7c82fbdd5f8f29dac73"/><dir name="Standard"><file name="Courier.php" hash="3b3d4218603cfcd34cfabc179e7f3f73"/><file name="CourierBold.php" hash="b70955c28021d6649fe054cd22b51fc4"/><file name="CourierBoldOblique.php" hash="b729f88ad30b611eeba22edd3b8fa459"/><file name="CourierOblique.php" hash="8e8539d42d5c0fd1955aa8e16ae25972"/><file name="Helvetica.php" hash="ee02948b7a86a3c9ca4f86e626132b67"/><file name="HelveticaBold.php" hash="ebffd50cf98e9fa413b6b03b89ed3e09"/><file name="HelveticaBoldOblique.php" hash="bb299a41ed55296f754780db31f2c615"/><file name="HelveticaOblique.php" hash="bb9b49508864fbed9a4568bad381d763"/><file name="Symbol.php" hash="8f97c770417d761a5203a49203420ff3"/><file name="TimesBold.php" hash="9fdeb478a3c7485c2e2a48b5f92c7920"/><file name="TimesBoldItalic.php" hash="cc2eb49f05a0918f8b6f6e967f31eee4"/><file name="TimesItalic.php" hash="45437d0c15a386f5af4347b6228107eb"/><file name="TimesRoman.php" hash="de53b82ff3939f9da82f70f0f1b94626"/><file name="ZapfDingbats.php" hash="2cfa09ba989f1b4f46b4bb996ff2882b"/></dir><file name="Standard.php" hash="40ba3ae98c4b6d0053e814be0a1beac0"/></dir><file name="Simple.php" hash="11ef33837f0a4a1f416f4af213771caf"/><file name="Type0.php" hash="faf743abcc418ee0afa37355ebb5d379"/></dir><file name="Font.php" hash="8f43a3971c1da8a16703318742cbebe0"/><file name="GraphicsState.php" hash="fd750e0510db3e657ab7e2ac3e1e3a50"/><dir name="Image"><file name="Jpeg.php" hash="5c733863b397860e4844f91b95aba02f"/><file name="Png.php" hash="a0c12c7fd22c0563048cc0edc9ba211e"/><file name="Tiff.php" hash="4586078648f30e1855d3199013a2657c"/></dir><file name="Image.php" hash="33eb13b9663dc718890e779f53cf1eb5"/><file name="ImageFactory.php" hash="1452bf575be68d1fccbb94cf5076b193"/><file name="Unified.php" hash="a4cf18e5e75912625539426d6ff3686b"/></dir><file name="Resource.php" hash="4ca41e625ca40411c4737980640ad126"/><file name="StringParser.php" hash="14317d396c0b7c8df72f85312a1d09ac"/><file name="Style.php" hash="6ad2bf1300bba189fda02714a480a7a7"/><file name="Target.php" hash="e0cef6297efe3ee206dc28ff8f303a46"/><dir name="Trailer"><file name="Generator.php" hash="c8865297f5dbaaa917538ea81d402809"/><file name="Keeper.php" hash="b03b64f1df0b2df66480b7631848a2b7"/></dir><file name="Trailer.php" hash="fe14a3ea6a3eef29852e4d89b087e12e"/><file name="UpdateInfoContainer.php" hash="00465947fa2bf6bc2821d223d8175425"/></dir><file name="Pdf.php" hash="04c7ed84b270d7d9ca9ef9abbda4d39b"/><dir name="ProgressBar"><dir name="Adapter"><file name="Console.php" hash="8cb35389d5f6be72e1bea06017d78b06"/><file name="Exception.php" hash="d0229875be561b5de3cb549e80190a0e"/><file name="JsPull.php" hash="7020fc0888740e4f1377b275171cd7e4"/><file name="JsPush.php" hash="c4eb3392eff7fa4b333d3bf72e8e3b4e"/></dir><file name="Adapter.php" hash="990efc830d988bb9eea966560d3acaf0"/><file name="Exception.php" hash="e87806dd074b1a6a55bd9059278966f3"/></dir><file name="ProgressBar.php" hash="ea1088d60f2aac380b86a4bbefdcd37b"/><dir name="Queue"><dir name="Adapter"><file name="Activemq.php" hash="9d3a57a54bbc449cde2b4586a7c178a8"/><file name="AdapterAbstract.php" hash="00bb9294c002b6daf8689ef8aeb82232"/><file name="AdapterInterface.php" hash="70a4fdec1fe0fdd7fe58c5a7589d66e3"/><file name="Array.php" hash="62295bae3d388928702b31c876e7c25a"/><dir name="Db"><file name="Message.php" hash="fb60411394b83822fce01b3ee5c5b1ef"/><file name="Queue.php" hash="50a6c56a70465acc98de0cb2712b07ee"/><file name="mysql.sql" hash="487d5a36b9172382351a7cc39d20d221"/><file name="postgresql.sql" hash="26ec9d62691baa5346df867dcb047114"/><file name="queue_sqlite.sql" hash="a80532d544c4e7d46e4268ce99decca7"/><file name="sqlsrv.sql" hash="646346084e937e9239d911485bc0296c"/></dir><file name="Db.php" hash="f4ca998edb48603e4db004b89a7b9198"/><file name="Memcacheq.php" hash="001281107b4a82beb5650eaa353e6ba3"/><file name="Null.php" hash="233db05e4c07b7d08e082dab5e644030"/><file name="PlatformJobQueue.php" hash="5cade6a3a94283accbe2b935b3dd7c2c"/></dir><file name="Exception.php" hash="a401570b43926c70dc9f581eaf141e09"/><dir name="Message"><file name="Iterator.php" hash="4793f7dd8e1913cecd5d82051324b12e"/><file name="PlatformJob.php" hash="677f090d35930b6be84d3bf259f296a1"/></dir><file name="Message.php" hash="673f05b548e4077166c489f281e443c6"/><dir name="Stomp"><dir name="Client"><file name="Connection.php" hash="cd8ca262b444a37fec5a7cc8a718f349"/><file name="ConnectionInterface.php" hash="851371e9f2e4583ab73bf570a13b3a95"/></dir><file name="Client.php" hash="0ddcc52a83e78370a721b32bc126b46e"/><file name="Frame.php" hash="a1ed7b4f5a6285ce7da3de588e71dfa8"/><file name="FrameInterface.php" hash="935c7488e415787f7d5712f16adc0b49"/></dir></dir><file name="Queue.php" hash="2b0d59ebb33defc6d80fc9c813cfdde2"/><dir name="Reflection"><file name="Class.php" hash="bb4e17c711e2c3c6eafe507409e864df"/><dir name="Docblock"><dir name="Tag"><file name="Param.php" hash="eed6d462ded647a769ee5f0c2cd166b9"/><file name="Return.php" hash="3cde686d679ec5bdc123934bc7734fac"/></dir><file name="Tag.php" hash="dc1b1a2f3a0339af13653e393f591c67"/></dir><file name="Docblock.php" hash="7686e936c6b2629059108fddcf6a4763"/><file name="Exception.php" hash="dde98d8b8979f493cb9f519198b65898"/><file name="Extension.php" hash="79e3465355e4f03a6eb15a38723336dd"/><file name="File.php" hash="b4a88b280d115c59ea486b5e8b7cdce7"/><file name="Function.php" hash="8f12773bb47d293fc321bd74a07ad84f"/><file name="Method.php" hash="7a29c5dded291d7f4e4c154416dd14fe"/><file name="Parameter.php" hash="f2412aac73e34ce9bf741fbacbf5c1b9"/><file name="Property.php" hash="49cc0db2a463667fbbfc40f5b512359c"/></dir><file name="Registry.php" hash="f34bbad6b292744243a15b9f861e72f5"/><dir name="Rest"><dir name="Client"><file name="Exception.php" hash="f2e187b798e1a53e47fd93e3087d2cf3"/><dir name="Result"><file name="Exception.php" hash="025e32d507a1b2ee78581e016f7508d7"/></dir><file name="Result.php" hash="f2930cd69965bcab06ecfa89f3da7a10"/></dir><file name="Client.php" hash="9b5df9abd8129bc73096124b3bf019b9"/><file name="Controller.php" hash="b2c54ef731116c22f918d5a9f605a450"/><file name="Exception.php" hash="913fd8be24e25d54348cda0456c74edf"/><file name="Route.php" hash="7587f5d89767375574701ef9cd8faa31"/><dir name="Server"><file name="Exception.php" hash="77de1c7443304a9eb52e4c7b7f7e3e09"/></dir><file name="Server.php" hash="94cb11c396c009f0edee382f279fa507"/></dir><dir name="Search"><file name="Exception.php" hash="3c8c14923b174d4cf18ad32bbd776deb"/><dir name="Lucene"><dir name="Analysis"><dir name="Analyzer"><dir name="Common"><dir name="Text"><file name="CaseInsensitive.php" hash="fa2ee6ad20fe7ef2aa0a565681d5ec0a"/></dir><file name="Text.php" hash="0f4faf6cfa64fa74beded56e4e74d3d8"/><dir name="TextNum"><file name="CaseInsensitive.php" hash="ef9d9187883b5ed0f54f7b77dbe80635"/></dir><file name="TextNum.php" hash="84193ab6c07fb76206fe57fc17212687"/><dir name="Utf8"><file name="CaseInsensitive.php" hash="f613dfbd5c4659bf8ba14f562050b65c"/></dir><file name="Utf8.php" hash="e853f8f14e531ce4e3ff08984d69d8e8"/><dir name="Utf8Num"><file name="CaseInsensitive.php" hash="3c46453ac48e882d5a9e3e6a41e6c8b9"/></dir><file name="Utf8Num.php" hash="eed75941e9c2155e0a70f2fd5eeceae5"/></dir><file name="Common.php" hash="b42be4c949b722f9e49021882a7aa724"/></dir><file name="Analyzer.php" hash="c815e8cc275039b8588843963a07cc88"/><file name="Token.php" hash="f58966bd5d345e547da5cc7d609f639f"/><dir name="TokenFilter"><file name="LowerCase.php" hash="362d3c1f3ebd3481fe4c78f33ec8fec6"/><file name="LowerCaseUtf8.php" hash="aa75c360d12a745a5af20dd3cdc6d754"/><file name="ShortWords.php" hash="fd8ddaee3b76eedfda397cc5198238f3"/><file name="StopWords.php" hash="43ce5ab735462ef46df3af42f526d43b"/></dir><file name="TokenFilter.php" hash="5ac1df974779e9113f2b2e1de63cbf22"/></dir><dir name="Document"><file name="Docx.php" hash="713d2637c73236c4b51ac424aafd34f2"/><file name="Exception.php" hash="6a9874b0775b4747914c9b6b088feaaa"/><file name="Html.php" hash="ee7d104c4aa6e5fdd8a523a027bfc124"/><file name="OpenXml.php" hash="a11d8c8c5caa40325e8c3e9b987518f6"/><file name="Pptx.php" hash="72641dcc1bb5a1aab99637b7ed93a68e"/><file name="Xlsx.php" hash="6f322d850f8270238ba983d5f0b7f2bb"/></dir><file name="Document.php" hash="cbd978b3ef80f77d61e81055989e8d37"/><file name="Exception.php" hash="43aadcc63ed74e04b5bf6eb34d9d77a8"/><file name="FSM.php" hash="730e43d7bbb78a35a8017c0e3a20b6bc"/><file name="FSMAction.php" hash="e91940fe17d40b15c2160176a134f8c2"/><file name="Field.php" hash="e8ab9ef7d159f56b065ce6e456d0a951"/><dir name="Index"><file name="DictionaryLoader.php" hash="a278066e923371a64d5443390f502d6f"/><file name="DocsFilter.php" hash="1b9636cf3fb56511e2e072c869d74302"/><file name="FieldInfo.php" hash="9d2894953179586a21952e5917169b61"/><file name="SegmentInfo.php" hash="62cb1a5ebab13485fceaa82583ad614f"/><file name="SegmentMerger.php" hash="bfd86027673b1af051210080d45caf82"/><dir name="SegmentWriter"><file name="DocumentWriter.php" hash="3e81ed8487804c6b935c6ccbd5f8bced"/><file name="StreamWriter.php" hash="5b83986b81243c65f715e24a2349e954"/></dir><file name="SegmentWriter.php" hash="b2262ba6797109994bf672c957e12c40"/><file name="Term.php" hash="681a3006597261d3955b7e297b9337e8"/><file name="TermInfo.php" hash="511ac7aaf73a6728c6af0b92cc6983d2"/><file name="TermsPriorityQueue.php" hash="f195f1a825e6adafba68ec0fdda83771"/><dir name="TermsStream"><file name="Interface.php" hash="814593a28e6b7cc6c0fb6d8c10ef30b4"/></dir><file name="Writer.php" hash="5e9e2424eb565dcf12a0baa402a0662c"/></dir><file name="Interface.php" hash="27bf4293a7f5836b80d79c4179109c70"/><file name="LockManager.php" hash="0d6fba6cf2778d1acd2fe04523bbae91"/><file name="MultiSearcher.php" hash="7bf7b4bc5bdd2783230386d9774de47f"/><file name="PriorityQueue.php" hash="11cdd54d906d213ec9977a42713f39aa"/><file name="Proxy.php" hash="e7e5eb7242f70b54fbd3b5e8c78cb6d5"/><dir name="Search"><file name="BooleanExpressionRecognizer.php" hash="a6cd05b6a89c96a41e8935087eb8f64c"/><dir name="Highlighter"><file name="Default.php" hash="51b3287f46ce9688ea1b7540e089adce"/><file name="Interface.php" hash="9f96f5286527cf84ec480e2e2d818c70"/></dir><dir name="Query"><file name="Boolean.php" hash="0573b2a7ac62a740479f6e1365aa3c4a"/><file name="Empty.php" hash="1c8c3ccdfbcafc92b3410226f148ecef"/><file name="Fuzzy.php" hash="e6c224bc442b933dbf79b0daf93f872f"/><file name="Insignificant.php" hash="903bdf5466cbc2842d69de559bbb190a"/><file name="MultiTerm.php" hash="1bc601458de8f002ea290a108837b2f9"/><file name="Phrase.php" hash="ebc16d270322c50586b0900ef2ea226f"/><dir name="Preprocessing"><file name="Fuzzy.php" hash="778e64c7d0a702b0438ca43a6e9b835c"/><file name="Phrase.php" hash="2923d2fd4b98391dfb49be955bddf1c2"/><file name="Term.php" hash="659714e34322a7e2d9ba83cb3ea01f90"/></dir><file name="Preprocessing.php" hash="7e572bfc96d92eef3480ccc799addb5f"/><file name="Range.php" hash="4ef3da32d8fd5d456e45bcb02e9793cc"/><file name="Term.php" hash="b26eaba4d343be48ebf6843ff75d7668"/><file name="Wildcard.php" hash="245eacf5e14c05c34e7e73b4fa1cfe1c"/></dir><file name="Query.php" hash="51e1ab4152067e3b85c0073be19b5dc2"/><dir name="QueryEntry"><file name="Phrase.php" hash="7213e216675140e9e99ea02d27edce49"/><file name="Subquery.php" hash="102d2354772182ad61fe488227f5c9fc"/><file name="Term.php" hash="fcbdb136b425abbc77815fdefd3120d6"/></dir><file name="QueryEntry.php" hash="e6c714bc8ed58b2567a98bdaa3243473"/><file name="QueryHit.php" hash="9db5c186f9c220b521296cb317d13fec"/><file name="QueryLexer.php" hash="7af1f01915ba44d8a68c88ca0d399bb1"/><file name="QueryParser.php" hash="253ce0f6df38fa5a6f7e8c8ca4eeb08f"/><file name="QueryParserContext.php" hash="5a76f304adc592115df8f711311f300a"/><file name="QueryParserException.php" hash="29bbaffe4cbfb4edee53f611952b9678"/><file name="QueryToken.php" hash="aba8dcb6f2288508a375a6b5736660f3"/><dir name="Similarity"><file name="Default.php" hash="1fffb953abc32368b45a925437cc69db"/></dir><file name="Similarity.php" hash="9deafbbc5d324764da2e5ecdb36c56bf"/><dir name="Weight"><file name="Boolean.php" hash="25f773a7d8264194b8f430ef4e71d8b1"/><file name="Empty.php" hash="4faac6f87a6cb7f5ed6632327927195e"/><file name="MultiTerm.php" hash="0cecfc9d8d812aba5f4e75ced9016610"/><file name="Phrase.php" hash="2757cc17c4311891ee588510ff0431c6"/><file name="Term.php" hash="b8f007b44d147f7ca9d68fb4fb9602bd"/></dir><file name="Weight.php" hash="5597f3d28d2742be273407ed9c5a359d"/></dir><dir name="Storage"><dir name="Directory"><file name="Filesystem.php" hash="75395b9b096165009954319773f5e179"/></dir><file name="Directory.php" hash="94417a2e722bd7032e0fd521c3e8b6e3"/><dir name="File"><file name="Filesystem.php" hash="a591cf691b3a54fe002974f897e95beb"/><file name="Memory.php" hash="a820934fee5978071826f612a6f3eec7"/></dir><file name="File.php" hash="eeab38b16e01fd292fcec8748193a3f4"/></dir><file name="TermStreamsPriorityQueue.php" hash="9f17bbdeee036cf3ba6b11d63ea5bc0d"/></dir><file name="Lucene.php" hash="b7062979861002453f0101f1e58678a8"/></dir><dir name="Serializer"><dir name="Adapter"><file name="AdapterAbstract.php" hash="00f63c2b73e59828e543c0bf1312c8e8"/><file name="AdapterInterface.php" hash="359e8660c9560e4455985344b9253f10"/><file name="Amf0.php" hash="0729345305a0df0b8a779c0595216cda"/><file name="Amf3.php" hash="67b8f6e8cdde6b9755ca43c6ec3e24ba"/><file name="Igbinary.php" hash="6c1bf3fa14d634fdc59dc92237d90460"/><file name="Json.php" hash="979dac9f01b852a5828927f65b3d21ef"/><file name="PhpCode.php" hash="2c9589603f4efcd74f08d61aeb4746e2"/><file name="PhpSerialize.php" hash="c500d8b5baa978ec0b8dd64288cde50f"/><file name="PythonPickle.php" hash="8a1c119b3962c15d92384544a88a9f41"/><file name="Wddx.php" hash="7f6947cfe3e21e791e414744d24986d4"/></dir><file name="Exception.php" hash="c6c2a48184caf5a259da1cb9aebcfcc4"/></dir><file name="Serializer.php" hash="e36d1cb9a5d9613843c3bfeed09377d6"/><dir name="Server"><file name="Abstract.php" hash="2d505ed66dede11ff6731bf40a4343c8"/><file name="Cache.php" hash="50b8d2628647d52e65d86be551b46584"/><file name="Definition.php" hash="e7a6eaf28b552fd1564f0b585c75a0bf"/><file name="Exception.php" hash="7b23e027c754749463430b3c68e2e2c3"/><file name="Interface.php" hash="3a2f664fff432e77d66b01b7d434401a"/><dir name="Method"><file name="Callback.php" hash="42c2dc71adf25ab015a0bbc98fc959c7"/><file name="Definition.php" hash="c199e388508ec1c792c8285f980c2ac5"/><file name="Parameter.php" hash="87d821dcf0ea16f891459a0c088ff129"/><file name="Prototype.php" hash="9e4790c70447048358e6129528e0f176"/></dir><dir name="Reflection"><file name="Class.php" hash="423f7cacbd173dc62a27760850eefd6d"/><file name="Exception.php" hash="adf3d137bcf4c08cb926b0c9c6acef94"/><dir name="Function"><file name="Abstract.php" hash="2f17b2130c90377eee6b767e045f2982"/></dir><file name="Function.php" hash="f8c3dddde66f2b4bcfd35d6be30cff4b"/><file name="Method.php" hash="696b308c74b600c136339ae8bcbcabe2"/><file name="Node.php" hash="76f033882195d7860e62e83889e42f9a"/><file name="Parameter.php" hash="b1c804d58f87c98cec4b43c95941333b"/><file name="Prototype.php" hash="0175a630e891e6db2670a4ccdd449edf"/><file name="ReturnValue.php" hash="044c5e76a7665418d7d143c3e871f776"/></dir><file name="Reflection.php" hash="4f0a6d298a2694c706cebc4d009eeeee"/></dir><dir name="Service"><file name="Abstract.php" hash="0412a88fdcb3b941f29630ef81fecf7c"/><file name="Akismet.php" hash="fa50b79922ebac6dd4c7743af0468a7d"/><dir name="Amazon"><file name="Abstract.php" hash="7d26ed4fdb3abdcc76ba3c001a21b216"/><file name="Accessories.php" hash="60cac2da0708233a073e89b68aa1f1c9"/><dir name="Authentication"><file name="Exception.php" hash="b57d2d7e74bc6d407421ab8e651d6c24"/><file name="S3.php" hash="debfb3d20e69170ba6454b761a6b816a"/><file name="V1.php" hash="ec8ab1ca030d4d554c69bf7f12101366"/><file name="V2.php" hash="06fd0e5bf47b38ca16608180fd85b0a5"/></dir><file name="Authentication.php" hash="c7f173399296d98d333e9d2a1b89731e"/><file name="CustomerReview.php" hash="9dc8a5bbc5ef9cb651270a52b5c1cc88"/><dir name="Ec2"><file name="Abstract.php" hash="e7443a03d4c72ad3c1be5b0552016b34"/><file name="Availabilityzones.php" hash="69352a9af50780e7a2907015204bfe4e"/><file name="CloudWatch.php" hash="bea191e43dcccf6635388db0d5f2e81d"/><file name="Ebs.php" hash="658f16eab78995149f56131c3585d6ac"/><file name="Elasticip.php" hash="a258b2d47fad28dcb40b1fc83e1cfaac"/><file name="Exception.php" hash="12759508340cdd45d4ae03391d1c37f2"/><file name="Image.php" hash="2a3c9138ff291d9de3fb3f22f8c89fff"/><dir name="Instance"><file name="Reserved.php" hash="920fe5640b62eb215b575f47d8a4ef3c"/><file name="Windows.php" hash="8bd6a00571054caae060fff3dd241917"/></dir><file name="Instance.php" hash="f8cfadd01c6b419c99734631bd6fc344"/><file name="Keypair.php" hash="f2c731f1a5e86b82f38be9c736d9b812"/><file name="Region.php" hash="54b21d60d496f2a8009f759575d1f298"/><file name="Response.php" hash="b9a3895643fcb7723db352de5cd1e805"/><file name="Securitygroups.php" hash="de6e9d9d38d853d4e7581ec09cd9187d"/></dir><file name="Ec2.php" hash="65368828e789d82a059fcdfdd4ccd6d0"/><file name="EditorialReview.php" hash="c3a63b5f8e947e40f8fe618253e870f1"/><file name="Exception.php" hash="6fcd6f497d359663a40b17513f06f8bc"/><file name="Image.php" hash="221d5acebdb9d7865aa143c1caf3d3c2"/><file name="Item.php" hash="6ce86590a0a09277a4b0c862eccec517"/><file name="ListmaniaList.php" hash="830ea46a55efb777c3ce3b374f53cfc0"/><file name="Offer.php" hash="e1560d0bb23f5bb7a7cc945c966cff02"/><file name="OfferSet.php" hash="6901e686b2daad8fe1bd901d8fddf477"/><file name="Query.php" hash="82b82a27a4f1cf00bf4db446de95802c"/><file name="ResultSet.php" hash="23ea894c3fb90645f2425243630decba"/><dir name="S3"><file name="Exception.php" hash="1c49e8b4771d201cc7130e58ee15ab8d"/><file name="Stream.php" hash="eb9a902a4963a99fa3ebcc063e85581a"/></dir><file name="S3.php" hash="b6fc9bb861a5d34f942ed200bbd86bed"/><file name="SimilarProduct.php" hash="d9c82fc39868c87e863ed991fb8623d8"/><dir name="SimpleDb"><file name="Attribute.php" hash="f2639661ff625a4c7304b2796f3104dd"/><file name="Exception.php" hash="d8db530d9c2251321275f5907ed3f9d6"/><file name="Page.php" hash="029eeab6712df4339d41d2b89f1f12f3"/><file name="Response.php" hash="c8114ef9e7c61f600c1ad714a7ecc4d0"/></dir><file name="SimpleDb.php" hash="b8b8e93901eac7e6c38eedad43ea108d"/><dir name="Sqs"><file name="Exception.php" hash="66937ac7b607dd7f3c74501ab4348416"/></dir><file name="Sqs.php" hash="7517db109bfe8721b417d6d453d27dff"/></dir><file name="Amazon.php" hash="c23a5f8708a2f41b5a937ecd795b2695"/><file name="Audioscrobbler.php" hash="7f163c17fdd3b73de173b05889d089a5"/><dir name="Delicious"><file name="Exception.php" hash="645c52466fe070730280e1f3429c0786"/><file name="Post.php" hash="b77fa9826095f7981f48b6c496ca2734"/><file name="PostList.php" hash="5d93a696aee824b416948a368703cedf"/><file name="SimplePost.php" hash="713feba7c441fc018539fbb7f416c808"/></dir><file name="Delicious.php" hash="1658664f91e6747efcb503f4c251a0f9"/><dir name="DeveloperGarden"><dir name="BaseUserService"><file name="AccountBalance.php" hash="f79170567edec47a6a090c365df5af2b"/></dir><file name="BaseUserService.php" hash="af64e0ce0b7d5d0b5076dc1c84697357"/><dir name="Client"><file name="ClientAbstract.php" hash="87184dd55cd68ea4d515d5966e9d649e"/><file name="Exception.php" hash="c714a1760f8f6f694bd1bb7477ff0e8a"/><file name="Soap.php" hash="bf5e8a26fe2916c9b12c04038126beb8"/></dir><dir name="ConferenceCall"><file name="ConferenceAccount.php" hash="1e9ce1d051d866d2801a7e8864d47bb9"/><file name="ConferenceDetail.php" hash="d7fcc3790cabad7caf31512cb6c304a1"/><file name="ConferenceSchedule.php" hash="3f35fe13bc9fe4cf9fea6c6bb199ad6d"/><file name="Exception.php" hash="c691961dca7f48518dd4388addf4510b"/><file name="Participant.php" hash="6a309add06bfd3a253e1f09731ff5c1d"/><file name="ParticipantDetail.php" hash="76c7e1ca785ed0d0eeb3656f9e02e976"/><file name="ParticipantStatus.php" hash="e7181c14f23fc5e51916443ba84fbcaf"/></dir><file name="ConferenceCall.php" hash="68ee15503de5485ce226444cbfcf67a9"/><file name="Credential.php" hash="553824a1865123d99a282ee9fb28d68d"/><file name="Exception.php" hash="a8e7e0d30b39fcbe0d2323ebaeff80e2"/><dir name="IpLocation"><file name="IpAddress.php" hash="b7b251103e3fa31583d19c6a5af697a6"/></dir><file name="IpLocation.php" hash="8877545dcc75a4b9d575e51761117b84"/><dir name="LocalSearch"><file name="Exception.php" hash="d21353d9bb033fc03e4d5c7df298a466"/><file name="SearchParameters.php" hash="9be38b65580fcc768688b0d16de01dc7"/></dir><file name="LocalSearch.php" hash="cd3f89ad741eb01805f2914c56d6bfbe"/><dir name="Request"><dir name="BaseUserService"><file name="ChangeQuotaPool.php" hash="7d07a073630d20c14bc95492626041ac"/><file name="GetAccountBalance.php" hash="bd2cbbac0468fda16f3f478fefb7ee7a"/><file name="GetQuotaInformation.php" hash="6c578c44163ba3743e9325fa0778d737"/></dir><dir name="ConferenceCall"><file name="AddConferenceTemplateParticipantRequest.php" hash="e1ec38e40ff42aeb56c0013bd7b22ab9"/><file name="CommitConferenceRequest.php" hash="626ef0071aa49a25a321e3a2534ac9df"/><file name="CreateConferenceRequest.php" hash="b35c5ef5ada6a2ca2f13f138d7d50783"/><file name="CreateConferenceTemplateRequest.php" hash="8d2b1eee48fd23f5aaac98f3a165c6ae"/><file name="GetConferenceListRequest.php" hash="9eabc4a04910e00c0eaaf00b53d32c27"/><file name="GetConferenceStatusRequest.php" hash="63b3fe97de1acef3b495132844dd674c"/><file name="GetConferenceTemplateListRequest.php" hash="b41e681c61460075d10102594a90a2ff"/><file name="GetConferenceTemplateParticipantRequest.php" hash="78622dc77853c97172beacc2749dc649"/><file name="GetConferenceTemplateRequest.php" hash="a07595acb913f2f6fce0bc2a3f0ba9c2"/><file name="GetParticipantStatusRequest.php" hash="5bdd6839b3458a3fcf34271868a0a6cc"/><file name="GetRunningConferenceRequest.php" hash="4d472a461c52f1161d35aab259bcc6c4"/><file name="NewParticipantRequest.php" hash="aeb6ccf91341f1a0f50c2e6b57bceb11"/><file name="RemoveConferenceRequest.php" hash="b4e0ba1514940d769c17deaf47dab254"/><file name="RemoveConferenceTemplateParticipantRequest.php" hash="c7e1d60bcdca90a6c2884208bba4d40a"/><file name="RemoveConferenceTemplateRequest.php" hash="cdb592dc5bbcaaa41b765ff0cd956883"/><file name="RemoveParticipantRequest.php" hash="8c43485d0de5338d691aab7ebfeee0a6"/><file name="UpdateConferenceRequest.php" hash="e5252a3bc32a17a8d700437d4750a736"/><file name="UpdateConferenceTemplateParticipantRequest.php" hash="a7f39edad417e126138577bf7c89ec5b"/><file name="UpdateConferenceTemplateRequest.php" hash="eab849312e233915fd82b01dcbe5df2c"/><file name="UpdateParticipantRequest.php" hash="8eb3192e8ab6b0539d8311752e010bc6"/></dir><file name="Exception.php" hash="ed88a3bca1969dce33a5d331531e50d9"/><dir name="IpLocation"><file name="LocateIPRequest.php" hash="d5948a8d3bb17bb03f8292f5cf5d6755"/></dir><dir name="LocalSearch"><file name="LocalSearchRequest.php" hash="7a9c2474b9fa343b0523268c70389690"/></dir><file name="RequestAbstract.php" hash="9d105331eebf7b6a3307745181b9689e"/><dir name="SendSms"><file name="SendFlashSMS.php" hash="0aabf3ea9fee98f832cbc4405736ea00"/><file name="SendSMS.php" hash="20f627b76d9927bd3ce4e57a560c0463"/><file name="SendSmsAbstract.php" hash="7a2231863323f6098bcce6af40812bbe"/></dir><dir name="SmsValidation"><file name="GetValidatedNumbers.php" hash="29f47fbf67253c8cdd352ccd6a43a2b9"/><file name="Invalidate.php" hash="06b2b72b641011b24d462ac951435ac5"/><file name="SendValidationKeyword.php" hash="6cf235bb1a8a3ce5833583fc600a66f3"/><file name="Validate.php" hash="a23be350c5e949b6024d37972f937554"/></dir><dir name="VoiceButler"><file name="CallStatus.php" hash="05f2ae35e8f7004dbdcf4ae6328fc6d1"/><file name="NewCall.php" hash="657bbeb498b8737e2846bc1e0c121a23"/><file name="NewCallSequenced.php" hash="b4f677a1e8a63d8c68a0d3e68e917b06"/><file name="TearDownCall.php" hash="f25f04cde8f2d1ab14a597fef0615b7c"/><file name="VoiceButlerAbstract.php" hash="29b7e15bb9134e977f3062106f7eb45f"/></dir></dir><dir name="Response"><file name="BaseType.php" hash="11e1e6d22a7408224f8b4a9e883299e5"/><dir name="BaseUserService"><file name="ChangeQuotaPoolResponse.php" hash="6e9beba43ac46ab962166ceebea64b99"/><file name="GetAccountBalanceResponse.php" hash="40399d98de8d87707e93e1490531a3e1"/><file name="GetQuotaInformationResponse.php" hash="e0eb9e714f4f5006a54ccf09035792c7"/></dir><dir name="ConferenceCall"><file name="AddConferenceTemplateParticipantResponse.php" hash="187f49c651c1cf104b1219f3f42b840e"/><file name="AddConferenceTemplateParticipantResponseType.php" hash="ac25c054b9358e19ec5c295bd3ddcf35"/><file name="CCSResponseType.php" hash="c2521ce1f93e8627841099ff94034a2d"/><file name="CommitConferenceResponse.php" hash="f07e6d932bf344ffd4525ecafca3d7a7"/><file name="ConferenceCallAbstract.php" hash="298413d2ba12b62d3f319adc7351cf42"/><file name="CreateConferenceResponse.php" hash="11520f7d9a06872880daeb8e60a457d4"/><file name="CreateConferenceResponseType.php" hash="83a0bdf9d153ab3dd3a641fda10f74a6"/><file name="CreateConferenceTemplateResponse.php" hash="0468ab810394d0b5bd0bdea546b109a0"/><file name="CreateConferenceTemplateResponseType.php" hash="f77767a3bcc865b9668d233816c0096a"/><file name="GetConferenceListResponse.php" hash="42d76086f4230707a2cca65f3dcdc3b3"/><file name="GetConferenceListResponseType.php" hash="284549e8d2dc27692c3651fd03ef4fc7"/><file name="GetConferenceStatusResponse.php" hash="3dce4adca4b60fde7651060d5bf69b8c"/><file name="GetConferenceStatusResponseType.php" hash="1fd7ea65a123e7b0da505a723e352bc5"/><file name="GetConferenceTemplateListResponse.php" hash="ada13d6275cc99d49a1a531b85c00703"/><file name="GetConferenceTemplateListResponseType.php" hash="f2adb40971c91411d1484fce7562bf56"/><file name="GetConferenceTemplateParticipantResponse.php" hash="0df784c1ede3137e0a0632171aa7c6e4"/><file name="GetConferenceTemplateParticipantResponseType.php" hash="c98f2e9303f2257210fd8edc22c04f72"/><file name="GetConferenceTemplateResponse.php" hash="c46157d6816e3a96187a54bdc9da0683"/><file name="GetConferenceTemplateResponseType.php" hash="39c12333f674c0e53a90f476ffbda846"/><file name="GetParticipantStatusResponse.php" hash="3b63f682a91c17d26501aa9bccff6a49"/><file name="GetParticipantStatusResponseType.php" hash="fe1b85cca01dd761f57f755cd6e61cbf"/><file name="GetRunningConferenceResponse.php" hash="035c70f82ba1c87fa9231b21c6ab4824"/><file name="GetRunningConferenceResponseType.php" hash="e666e820232c0ca5e95649fcdcb3dc91"/><file name="NewParticipantResponse.php" hash="e125a27451f6ca6e7fec1adb32a39f9e"/><file name="NewParticipantResponseType.php" hash="7bac2c703343f38db9a384a48bd358de"/><file name="RemoveConferenceResponse.php" hash="e9618cc675c9ff3c4c80461c910fa173"/><file name="RemoveConferenceTemplateParticipantResponse.php" hash="bbd8a6979c7a7cd4160e921de332a753"/><file name="RemoveConferenceTemplateResponse.php" hash="83e588fa92bb6c06a47264835c349f74"/><file name="RemoveParticipantResponse.php" hash="82736f7663b5a0d1d1790050248268cb"/><file name="UpdateConferenceResponse.php" hash="f56ce564487e74af924abdd3f081b65e"/><file name="UpdateConferenceTemplateParticipantResponse.php" hash="44dce67384238cc364d9fc53790dfdf3"/><file name="UpdateConferenceTemplateResponse.php" hash="1bdd59f91a5b04f26308473d8f02a703"/><file name="UpdateParticipantResponse.php" hash="caaf0507e44ea3a3e5bf30a1aac2af87"/></dir><file name="Exception.php" hash="88541ada3989a48ea59fdbb46e57bc83"/><dir name="IpLocation"><file name="CityType.php" hash="ed92cae06893bc016709b08895100446"/><file name="GeoCoordinatesType.php" hash="56835f1aa9b6977b3b96abbf5e71918a"/><file name="IPAddressLocationType.php" hash="7e0ce4fbb2aa1fd317e9c1f32f81aaa5"/><file name="LocateIPResponse.php" hash="d7fbc53e27c6f79ec178942feffee7ee"/><file name="LocateIPResponseType.php" hash="18629dbbbe5fdeee93a2af9ccdb18f1b"/><file name="RegionType.php" hash="32be1f484b0030847d4626310b9027f3"/></dir><dir name="LocalSearch"><file name="LocalSearchResponse.php" hash="50d7ee811673d93725ce717e815e9b2d"/><file name="LocalSearchResponseType.php" hash="b443f968ab6263d53a12c1b413372bd1"/></dir><file name="ResponseAbstract.php" hash="66a7552a7213c226aabc04c5808c7400"/><dir name="SecurityTokenServer"><file name="Exception.php" hash="feed3ce216c9961469a1ea99b001ecd7"/><file name="GetTokensResponse.php" hash="fd1f6ae9226a89ead7084ea9949dcc16"/><file name="Interface.php" hash="983f5d4acbb407ba862fea42794d741e"/><file name="SecurityTokenResponse.php" hash="cd54f9bcffd132346f43e81a91696efb"/></dir><dir name="SendSms"><file name="SendFlashSMSResponse.php" hash="6cc977e6bd210d5ba0b421741e43410d"/><file name="SendSMSResponse.php" hash="2a1e1e55cf81b2475539c478ce3b5ac6"/><file name="SendSmsAbstract.php" hash="5bff0bb46d58e0dc9f548727562240eb"/></dir><dir name="SmsValidation"><file name="GetValidatedNumbersResponse.php" hash="3d2150e119f3fc0cdf765caf89e89128"/><file name="InvalidateResponse.php" hash="3ac60cde5b9871317efb2cce8362f49c"/><file name="SendValidationKeywordResponse.php" hash="9bcf8a591f299676b19a43f43d9df1a7"/><file name="ValidateResponse.php" hash="33e6da6ce4d25adab3d751f664e8d0e9"/><file name="ValidatedNumber.php" hash="510d2e69a557e3f600f3c123cc89bda8"/></dir><dir name="VoiceButler"><file name="CallStatus2Response.php" hash="aeb1b64c32b7ba2d8c2aa0ee14232556"/><file name="CallStatusResponse.php" hash="74ad91498170a7b316c59bc53028f5fd"/><file name="NewCallResponse.php" hash="1bcb55ccec2dc0904c47c1ea353670f8"/><file name="NewCallSequencedResponse.php" hash="bee8d0769ec1913e6627f9bcd41b53ae"/><file name="TearDownCallResponse.php" hash="d26a19f13f695b7fc12d33587e043a6f"/><file name="VoiceButlerAbstract.php" hash="d20a379bf183299f3c045c83eb2d395d"/></dir></dir><dir name="SecurityTokenServer"><file name="Cache.php" hash="5dcc3f88b5486a115810942fdd97990f"/></dir><file name="SecurityTokenServer.php" hash="1c423e8d2e7e841990cb694ac24ed1c8"/><file name="SendSms.php" hash="c444b55a992ccfcf0683eaf17cc352b8"/><file name="SmsValidation.php" hash="30442a32d446ec8249c1f322cb32b24a"/><file name="VoiceCall.php" hash="d5ce08d14a833491cd788a3baaaa4cc4"/><dir name="Wsdl"><file name="IPLocation.wsdl" hash="c6d3ec9355a53217ad19e3a88bf93d58"/><file name="IPLocation.xsd" hash="828d9148850480554d495d5e3136e8ad"/><file name="ODGBaseUserService.wsdl" hash="f3f1b7f55039ada10b478442379bd0dc"/><file name="ODGBaseUserService.xsd" hash="bf1ebd5fac02d016dd0448da2cbe604e"/><file name="SmsService.wsdl" hash="d6f841c5f5c937d969b33b35ae064872"/><file name="SmsValidationUserService.wsdl" hash="54b3bc77215341815f463a67ab1618b1"/><file name="TokenService.wsdl" hash="1e114a47c300e39ccfae7aab5554b836"/><file name="VoiceButlerService.wsdl" hash="7295acf53bff893089620a0cd2c5aebf"/><file name="VoiceButlerService.xsd" hash="987d9ff2acf4c96325fb76577149f232"/><file name="ccsPort.wsdl" hash="8ce7db8dd24a15728a0d807b1d96c678"/><file name="ccsPort.xsd" hash="fa40ee2be9265fbbae88939636c047a5"/><file name="localsearch.wsdl" hash="e8b8663a0188732466b2e8d360b49611"/><file name="localsearch.xsd" hash="49309d306556a321d32349831ddbd193"/></dir></dir><dir name="Ebay"><file name="Abstract.php" hash="88403e7d8d4a8d9cfcea388220059228"/><file name="Exception.php" hash="3e637ac21f74b6dc2c076f44c41b2846"/><dir name="Finding"><file name="Abstract.php" hash="0e29709dadb475e6cbc682a74b034036"/><dir name="Aspect"><dir name="Histogram"><file name="Container.php" hash="6a40616cda7f6149f3de941d771af302"/><dir name="Value"><file name="Set.php" hash="beb0cc4871075d64179af266e373d356"/></dir><file name="Value.php" hash="487a340e8cb190d98dc9519264d2bb70"/></dir><file name="Set.php" hash="ce3747922ddaff2585d1a15dece8d607"/></dir><file name="Aspect.php" hash="d76f9f0c06af0033081793eb823a7e53"/><dir name="Category"><dir name="Histogram"><file name="Container.php" hash="7e5e641a906457e379c04d5094ee34c0"/><file name="Set.php" hash="48a86ef1847b1481133dafb26f23e8bb"/></dir><file name="Histogram.php" hash="d65dbf0753948e9ea4acea534c955c64"/></dir><file name="Category.php" hash="ccc3bc2f1b3a33e123ae9674e6979a72"/><dir name="Error"><dir name="Data"><file name="Set.php" hash="80424676b1051d2602f8235b75deb3e1"/></dir><file name="Data.php" hash="597d32923509bbc53ec3e93fd7a25d68"/><file name="Message.php" hash="23d36823b69c4464668c418722602cd8"/></dir><file name="Exception.php" hash="14a200160340eb77803117449dc8781f"/><file name="ListingInfo.php" hash="3e3cde79393e0ec207fd69d7939e2e06"/><file name="PaginationOutput.php" hash="7b3bbc317cfd034499d37e41e0143b87"/><dir name="Response"><file name="Abstract.php" hash="090c7afe6d0d0da571eb5957443a7688"/><file name="Histograms.php" hash="1d5270108cf9e05970e7aacc7b19d2d3"/><file name="Items.php" hash="3c8639004e5183a8b827430147228b12"/><file name="Keywords.php" hash="eaf384d5fecdf039a8040461f1002049"/></dir><dir name="Search"><dir name="Item"><file name="Set.php" hash="46e5e6bc9ae83e6b6537714fd7234228"/></dir><file name="Item.php" hash="30291c11101c9c5dac6b674f445267d9"/><file name="Result.php" hash="547c89e477bab4954d50a342861d25cc"/></dir><file name="SellerInfo.php" hash="4acaac063cd8806170e0fbd00ea9fcbc"/><file name="SellingStatus.php" hash="2c97bd9d9abb3774b6524da41a8a6249"/><dir name="Set"><file name="Abstract.php" hash="5ae22d47ec909a49cfaa4da53c1b01da"/></dir><file name="ShippingInfo.php" hash="cba6c5b17dfc52fe0e925a3032851496"/><file name="Storefront.php" hash="283c839d7094912c799fdc054badb498"/></dir><file name="Finding.php" hash="d616106f5ff603512d49a55cbcba61b8"/></dir><file name="Exception.php" hash="8044d6763d188874509b337021a3ee86"/><dir name="Flickr"><file name="Image.php" hash="30faef3a8c974028066b6adb74b6b0a3"/><file name="Result.php" hash="f6b0f3eb8f4d7ceef77f3f69443e394c"/><file name="ResultSet.php" hash="0526b66fdb89bb9f43e30026a933012f"/></dir><file name="Flickr.php" hash="3fda84dc066a19789ac3353bf171b7ba"/><dir name="LiveDocx"><file name="Exception.php" hash="b457983e53d43c4ff73bd0d7e07eeb47"/><file name="MailMerge.php" hash="c2a47d55da15e3d799d00286f71e8910"/></dir><file name="LiveDocx.php" hash="59586896411050b84c6c9584ca4ba70f"/><dir name="Nirvanix"><file name="Exception.php" hash="b7a41f6c989f7acd5477d0a90ca53b77"/><dir name="Namespace"><file name="Base.php" hash="e4c90392c665f80f53d51d883fe6b936"/><file name="Imfs.php" hash="98951fba46259ca64a8e346003e2f153"/></dir><file name="Response.php" hash="92c31f736004ae520017c79d6551d438"/></dir><file name="Nirvanix.php" hash="2e06bddd0a435d5396c07ca058361f4f"/><dir name="ReCaptcha"><file name="Exception.php" hash="df6a3a61944117f70db43556bbb4512c"/><dir name="MailHide"><file name="Exception.php" hash="abd91221b6d077f23feab991874ace69"/></dir><file name="MailHide.php" hash="4b26448313f40548b50a924ca754c265"/><file name="Response.php" hash="50744d69de2fa7f8bfaf3090dd5eb15d"/></dir><file name="ReCaptcha.php" hash="3e8b4f2a46352ee33689918598b9b63b"/><dir name="ShortUrl"><file name="AbstractShortener.php" hash="72ab1764923baea5a81f0df31a6302c5"/><file name="Exception.php" hash="fee896064d76d52aeef73e0fe4c2bff5"/><file name="IsGd.php" hash="7ea48b6e98782e94ad596e9666a36f79"/><file name="JdemCz.php" hash="8735a03688645540f5855d400adb2b83"/><file name="MetamarkNet.php" hash="997227f949b5b35535070e287cc869ec"/><file name="Shortener.php" hash="ac52db4fe2337e6467fe0cde6d7a93cc"/><file name="TinyUrlCom.php" hash="8e3bde90cc20ffb8336ecc9709e22147"/></dir><dir name="Simpy"><file name="Link.php" hash="82a9477b4af98ea18a0d0678840b5eab"/><file name="LinkQuery.php" hash="0ccf829b971b06d1601001d18e7243b0"/><file name="LinkSet.php" hash="0065fc38809bf338c3b026085bf3aa3c"/><file name="Note.php" hash="d3d7bada73e5180921a5a11ebf2250aa"/><file name="NoteSet.php" hash="9cdd9cb5ecf4167e621611cd3622a818"/><file name="Tag.php" hash="1908ae9d30075628dca765a2995ca8d7"/><file name="TagSet.php" hash="c1f63b2395a4a8a1935860c060a0307c"/><file name="Watchlist.php" hash="bda47e3df661193f16dc0e624a18ad39"/><file name="WatchlistFilter.php" hash="71db9a5ff5c8acfdfc826b36206cf8e5"/><file name="WatchlistFilterSet.php" hash="23c0eee9cd218d4a66d821d059d3f1e1"/><file name="WatchlistSet.php" hash="4028998702d6ff4aeb12547feb4437fb"/></dir><file name="Simpy.php" hash="921f1eb53d50afb07fa90117187aaef1"/><dir name="SlideShare"><file name="Exception.php" hash="6ee070163898600a24f6b70b5da61870"/><file name="SlideShow.php" hash="7e665e3db8e45ec0e0a7610ddbe3aba3"/></dir><file name="SlideShare.php" hash="99122b328026c0bc9418673e3476208e"/><dir name="StrikeIron"><file name="Base.php" hash="5f7d1e1899ea57d02c06290bd96c866f"/><file name="Decorator.php" hash="89f9167d6c69985c319a51588440eee5"/><file name="Exception.php" hash="67f392eec09b9b86df3e928fc2b488ab"/><file name="SalesUseTaxBasic.php" hash="7e1c527c1e229c9f81319830fae0e442"/><file name="USAddressVerification.php" hash="c2080fb80677c1931cf5069eeb09b377"/><file name="ZipCodeInfo.php" hash="8df54052a137dede10dea48dc8bd42b4"/></dir><file name="StrikeIron.php" hash="5099dd2e7e4a62e636233c3fded82136"/><dir name="Technorati"><file name="Author.php" hash="431a22f682d9a7ec8338e00bb3756473"/><file name="BlogInfoResult.php" hash="cbd0b30c009731cd887641fef8c733c1"/><file name="CosmosResult.php" hash="fb0bd11679e317d734767ece826afdb5"/><file name="CosmosResultSet.php" hash="eee8970d7a1f102fcc61ebc7201c82f6"/><file name="DailyCountsResult.php" hash="7612b73901c2de2f4b66736e0261d1f5"/><file name="DailyCountsResultSet.php" hash="f31dddc1678b40725cf50e74fcc433d9"/><file name="Exception.php" hash="943cf05d0b4aa8db599ed809553bef5d"/><file name="GetInfoResult.php" hash="417c5d78fc4b9fd31fac05053e3a7b2b"/><file name="KeyInfoResult.php" hash="aa36f067b7e31ce95c3a70225d25c8ce"/><file name="Result.php" hash="0cdaaa18c23497d57d0c054e0ea2ef0a"/><file name="ResultSet.php" hash="2e67bc5a8cb9bca3e7081611a80e8aef"/><file name="SearchResult.php" hash="0fe1c61f8f67a260f4b033f9e4f9a95e"/><file name="SearchResultSet.php" hash="73361c3e9f5eb03f93a3dbf32540f3e4"/><file name="TagResult.php" hash="759e57f8304c7dd21215cf6479697b34"/><file name="TagResultSet.php" hash="4f9d9c4e500b851f75f1c0069536410f"/><file name="TagsResult.php" hash="9abcd4741bfcff638cb91f33d775b821"/><file name="TagsResultSet.php" hash="292e6fdb796ccca14264016fcb7b0177"/><file name="Utils.php" hash="44c648492a15bf5baad2d3907d71ab7f"/><file name="Weblog.php" hash="09095874b5e46e561286b5df962dd243"/></dir><file name="Technorati.php" hash="2dedb79697abf834311e0819d7f10d35"/><dir name="Twitter"><file name="Exception.php" hash="c13262a566f11f7bf061909c18886f0f"/><file name="Search.php" hash="e81167d5b4ee94d6025e9dc6fd0398ee"/></dir><file name="Twitter.php" hash="3561351afecd360d8154b84fdfee582a"/><dir name="WindowsAzure"><dir name="Credentials"><file name="CredentialsAbstract.php" hash="bb9625e39c0fd573758cc3aa6bd56b23"/><file name="Exception.php" hash="555063904dc7391afd8157774377939b"/><file name="SharedAccessSignature.php" hash="7d81df39f33d23df5f525e4a59ba7b84"/><file name="SharedKey.php" hash="4b6ceeb5174e60d343cec4e0d38df544"/><file name="SharedKeyLite.php" hash="24832dcc60ace337e14d54754916880b"/></dir><dir name="Diagnostics"><file name="ConfigurationDataSources.php" hash="fb20a0be7434c7b5261bb85a0322faf3"/><file name="ConfigurationDiagnosticInfrastructureLogs.php" hash="4b439c45e73da00bff1929c5132dad81"/><file name="ConfigurationDirectories.php" hash="1955e7cf9b98348bb40cd6e57fa47b50"/><file name="ConfigurationInstance.php" hash="ce01d2409b87045f189bb9ea8c286a92"/><file name="ConfigurationLogs.php" hash="20b4934c04e12ff6d5b4493e711dbb17"/><file name="ConfigurationObjectBaseAbstract.php" hash="15c67b45a765ff06295f5314ba7ccdca"/><file name="ConfigurationPerformanceCounters.php" hash="5ee52a962612f8d84659686b94e57c9c"/><file name="ConfigurationWindowsEventLog.php" hash="d549fd47ec7e4789ce99d1f6d5e6904f"/><file name="DirectoryConfigurationSubscription.php" hash="44a3cdc7cd3723267d4cc16dc7438d04"/><file name="Exception.php" hash="9f00aea0dca0f67d2c70e6a58f432cbf"/><file name="LogLevel.php" hash="5f8f69903418a57da1ea1bed6a0fd4c3"/><file name="Manager.php" hash="487d2b08c157cbb21fbc2efb57ea6db7"/><file name="PerformanceCounterSubscription.php" hash="79239b551a7039a2aa668fdca5522ac1"/></dir><file name="Exception.php" hash="40c61ab4a332375b58c991ddfefe9517"/><dir name="RetryPolicy"><file name="Exception.php" hash="6b41bf3941dcd134860c24e572683c61"/><file name="NoRetry.php" hash="7e064c9d00dc2c34a4608eea4a9d7aca"/><file name="RetryN.php" hash="f1cb2af90e205ccecd7ea0ca09fe422a"/><file name="RetryPolicyAbstract.php" hash="d60f240b0539dd61577d9d0aa27221b1"/></dir><file name="SessionHandler.php" hash="bb7fc0d53de47f9de26b26f0b8905f6b"/><dir name="Storage"><file name="Batch.php" hash="58023d36bac71db76a281930fff1071f"/><file name="BatchStorageAbstract.php" hash="45fa8136fa6fc4dae3414f22d276fac2"/><dir name="Blob"><file name="Stream.php" hash="a3600a3268077f01b2129f7f6895ba95"/></dir><file name="Blob.php" hash="81128db6c31c5d1357119265b7456b92"/><file name="BlobContainer.php" hash="ae628720f59c2ca7853cf1baa0d4ea21"/><file name="BlobInstance.php" hash="cd0517654d1d6853b19ff9a8af0ce566"/><file name="DynamicTableEntity.php" hash="d1eada0c1822601dda89b9051ba517fe"/><file name="LeaseInstance.php" hash="e3e60471ab817612372b0ebfba906684"/><file name="PageRegionInstance.php" hash="d4853e64ae8ac70b1d223f7b7a3c94c2"/><file name="Queue.php" hash="125b1cbec32ef012f301ace6cdb8ade9"/><file name="QueueInstance.php" hash="e07ed54d0150737715db7de73687f6d7"/><file name="QueueMessage.php" hash="a65cb5aa8fb50c312b7e1b0a753bb632"/><file name="SignedIdentifier.php" hash="8dd704f90e45eee6ef7dca6cf149b352"/><file name="StorageEntityAbstract.php" hash="e0093644348904a1b7177179e89aa3eb"/><file name="Table.php" hash="fddea607cfd913022f86384a494e348d"/><file name="TableEntity.php" hash="4a2e027858d95216d9a9eb1682c8d695"/><file name="TableEntityQuery.php" hash="aca548b6e81dade746cf36e91cdf5b53"/><file name="TableInstance.php" hash="fea7e0eadc77bf539ac098a2e1e2542f"/></dir><file name="Storage.php" hash="93e15b9b82ae47ce9749f8dacf35c34b"/></dir><dir name="Yahoo"><file name="Image.php" hash="d49bf997623965f20d4dde4f6718ad8d"/><file name="ImageResult.php" hash="94445a0e554c9c9d1b4fa22643528b53"/><file name="ImageResultSet.php" hash="a3fe3a693b1e0581b4bcdcc7c0bbc065"/><file name="InlinkDataResult.php" hash="388a95776b8ccdbbd4a0e9a323d07083"/><file name="InlinkDataResultSet.php" hash="b1e79552d7d29c0e55c60e8396d8e262"/><file name="LocalResult.php" hash="a7883afa95e43c760a48cc1c9c7d62cb"/><file name="LocalResultSet.php" hash="1218f7603b1498e14ec958cc9ab320f3"/><file name="NewsResult.php" hash="e63561609a9fc2a624e06e349869bd60"/><file name="NewsResultSet.php" hash="0173b0bdb243560659dab8d16283d186"/><file name="PageDataResult.php" hash="263171c9ee642d16bce3abbba512932b"/><file name="PageDataResultSet.php" hash="118098b651efb1c9aa93bf622e7e504b"/><file name="Result.php" hash="53452dab965d54c33cc2960748f6e81a"/><file name="ResultSet.php" hash="8d53dfff6357cb0bfcabdfa148896a62"/><file name="VideoResult.php" hash="4285b75cd4b2b8801d60b85b1cb1bef7"/><file name="VideoResultSet.php" hash="9a39ce4da253fba282d8be63e3a17c60"/><file name="WebResult.php" hash="cdbed2fb4ea0de46fa427a11e8762669"/><file name="WebResultSet.php" hash="9e8b9967fede67b4466c5e4fd0ebf7d5"/></dir><file name="Yahoo.php" hash="c01da555a605cf953df7a8b3bb0d9351"/></dir><dir name="Session"><file name="Abstract.php" hash="fd3baa8933bc5231b2b6dbcf398c61a5"/><file name="Exception.php" hash="82c46aa26392188869fdb0df5294c18d"/><file name="Namespace.php" hash="76bddc151801bea02ef10bfa0baf5399"/><dir name="SaveHandler"><file name="DbTable.php" hash="7ac9ea1c157a8c11709577cfebebdae8"/><file name="Exception.php" hash="02d610f4f4d2c64acabb69a459c5199d"/><file name="Interface.php" hash="cc09232a8f82370716ded605232208f7"/></dir><dir name="Validator"><file name="Abstract.php" hash="7698ec5c79a304985f55a44822048807"/><file name="HttpUserAgent.php" hash="2823525751b854a65b6367b8db0fa33e"/><file name="Interface.php" hash="858a5bffe47a9814d0c00455e8faffba"/></dir></dir><file name="Session.php" hash="4c8e95698c04475c6dd890239eb5d5fb"/><dir name="Soap"><dir name="AutoDiscover"><file name="Exception.php" hash="c519a3d533ce61ca5ba0c6583e97c7ef"/></dir><file name="AutoDiscover.php" hash="f599edbf8427ae932918d56e77016c4f"/><dir name="Client"><file name="Common.php" hash="c25c2ce3de60b7234036a9f8dca955e2"/><file name="DotNet.php" hash="ff86379dd4d68ae4c50771ec375e409b"/><file name="Exception.php" hash="da43ee5dc00dedf5393d97aa6eb9551c"/><file name="Local.php" hash="3468564112b2f03b5c0d2929e353af72"/></dir><file name="Client.php" hash="8c64a002f18f25d21a27a0f67451cd13"/><dir name="Server"><file name="Exception.php" hash="f847a1cc2c3e495101285cedb2cd168c"/></dir><file name="Server.php" hash="f16cf5e97b1303d1d772be29ba616442"/><dir name="Wsdl"><file name="Exception.php" hash="37e10a5e857684d091dc28f30751641d"/><dir name="Strategy"><file name="Abstract.php" hash="8283fbb6f0cca34579710cc355dc7c6b"/><file name="AnyType.php" hash="af7dc5fc6a92983390ff60b642d61478"/><file name="ArrayOfTypeComplex.php" hash="4f2307b312906eacaeae01369fcf9195"/><file name="ArrayOfTypeSequence.php" hash="9b03febef5c7c353b6c62403f7c731b6"/><file name="Composite.php" hash="8792f71ba74eca18fc195cc1dfe2707d"/><file name="DefaultComplexType.php" hash="05a83d43e30c7270daca383bef4ed9da"/><file name="Interface.php" hash="702212f635afa93e803b6d2c4c0c7c4d"/></dir></dir><file name="Wsdl.php" hash="73116f631fa247acf8947e366103df20"/></dir><dir name="Tag"><dir name="Cloud"><dir name="Decorator"><file name="Cloud.php" hash="1b5e2180c451c904ceb9081d84945da3"/><file name="Exception.php" hash="9ac076e5f96cfdbef2385632f28608ae"/><file name="HtmlCloud.php" hash="6ad6d1b25364ec300238e1a4637c82fd"/><file name="HtmlTag.php" hash="f4b9288680ab9a07982ee3ed1ff74937"/><file name="Tag.php" hash="0ad9cf33f140c791d8d5bc1bbad120ec"/></dir><file name="Exception.php" hash="617b57417dd314d271fae6786be907de"/></dir><file name="Cloud.php" hash="a0974171cf3f4127d8a3a6e557d12b82"/><file name="Exception.php" hash="b28d9c8d0bb53e2e2072077ba0d54483"/><file name="Item.php" hash="051bf40d1f10956682d4471a1cf53b33"/><file name="ItemList.php" hash="a31ee7f766162429156353b0af2f18e3"/><file name="Taggable.php" hash="1ede206cb622919b1c0ecfceff4d5743"/></dir><dir name="Test"><file name="DbAdapter.php" hash="78249f7a87e906a39533e229d85db7db"/><file name="DbStatement.php" hash="2a21dc8d119b0dba8627cff26085088b"/><dir name="PHPUnit"><dir name="Constraint"><file name="DomQuery.php" hash="3cec737d40e2aa7c2e54d01d0cd512a0"/><file name="Exception.php" hash="eb0a0aea48be027fdb72e067e3076ebd"/><file name="Redirect.php" hash="08f490bfee477716630a794923cf8411"/><file name="ResponseHeader.php" hash="e1eb28c860ae3a0bec8e78e5f12c1b65"/></dir><file name="ControllerTestCase.php" hash="2d54a618bce9d5b12fd23bd0505c6a1d"/><file name="DatabaseTestCase.php" hash="b76150e6dd6b89610258f3395eb79f65"/><dir name="Db"><file name="Connection.php" hash="f55a469f907c610f0bfdc4f3a43a41f8"/><dir name="DataSet"><file name="DbRowset.php" hash="6ddf0e289963db27e7c280a9ed6d5126"/><file name="DbTable.php" hash="253789a5cad3cc5c30f90aca953ff963"/><file name="DbTableDataSet.php" hash="f2b0419649dab0121059f155abc550ac"/><file name="QueryDataSet.php" hash="1335ab746cce9b71d98e143c022b824a"/><file name="QueryTable.php" hash="5ce733923506b8ee3e6bbcb7b6d65879"/></dir><file name="Exception.php" hash="1d8046c32af3f1773b795546b0ccf805"/><dir name="Metadata"><file name="Generic.php" hash="84a66473947cabef3d9ef4fba3790fbc"/></dir><dir name="Operation"><file name="DeleteAll.php" hash="9dabc52439632794a564bd9105f4db30"/><file name="Insert.php" hash="9a9a391f6a5f6f4421b1f0910e73291a"/><file name="Truncate.php" hash="ae34049afc00e1ef0b1a9606ccf6e8df"/></dir><file name="SimpleTester.php" hash="269f8b38270f23ced6e730175d48efbb"/></dir></dir></dir><dir name="Text"><file name="Exception.php" hash="2e4a72013db739b05304d155a743b535"/><dir name="Figlet"><file name="Exception.php" hash="f786c5d3c52dfcc11d118ae2d98b637e"/><file name="zend-framework.flf" hash="13cef7e18eb9e7c439e2469d96fe2b55"/></dir><file name="Figlet.php" hash="3229c6095325123f624104d1b48a481b"/><file name="MultiByte.php" hash="22a48140cca534848b7a78e0089ab7f6"/><dir name="Table"><file name="Column.php" hash="dce90c6b6db6f4e1d0f8a344ab77ef00"/><dir name="Decorator"><file name="Ascii.php" hash="eb9498cb66209873fa03990f677c57c1"/><file name="Interface.php" hash="7f7c8778c43cba06f0ce06bb58932265"/><file name="Unicode.php" hash="eb19f1e9b600fdcd6d00c8e7e6c2061b"/></dir><file name="Exception.php" hash="d97815e673a114e18cc5e032bbf88b3f"/><file name="Row.php" hash="b295ec55b16a3450af9c024b2c00f5df"/></dir><file name="Table.php" hash="41fc96a8970c2f4699534674dc915f7a"/></dir><dir name="TimeSync"><file name="Exception.php" hash="5ff0de864d38bce2a9ca0b8425739d9a"/><file name="Ntp.php" hash="cf09a7657eacb68958164144334249d2"/><file name="Protocol.php" hash="b00ecb292054540f2cca9a928c5b542a"/><file name="Sntp.php" hash="53d757093a21c11fc224300a57fec11d"/></dir><file name="TimeSync.php" hash="efc2be67d66a9a2f27bc680026896317"/><dir name="Tool"><dir name="Framework"><dir name="Action"><file name="Base.php" hash="3b7ab51b6cd3d6a057d414356a72df43"/><file name="Exception.php" hash="1302307c64497553a4f819df23eaa6b9"/><file name="Interface.php" hash="c5351b30eb1bf88190a2f168fd131814"/><file name="Repository.php" hash="6aaacd4cf225015664ff2c3eff1c5ab0"/></dir><dir name="Client"><file name="Abstract.php" hash="1e2f5466532543efbaf66dd318ac02e7"/><file name="Config.php" hash="1a5358c455796156acb7b8c90bf26d87"/><dir name="Console"><file name="ArgumentParser.php" hash="871c20f3625d79b34afdec2c6a3f57df"/><file name="HelpSystem.php" hash="773ce288f7f4f0f31e7b043039780e5f"/><file name="Manifest.php" hash="4c6051f58d23f90fd8f5256887f39a8a"/><dir name="ResponseDecorator"><file name="AlignCenter.php" hash="50fce598e4a273c6bf261a83445e02d3"/><file name="Blockize.php" hash="77a91b0eec5bf910f66a6558ed3c07d6"/><file name="Colorizer.php" hash="2a5e425652ef3783dbd4395a08301da6"/><file name="Indention.php" hash="89e9eef962819272f8686678505a1ee5"/></dir></dir><file name="Console.php" hash="35701262f5761d7042b065a268c4ea88"/><file name="Exception.php" hash="c04dca07db5e1b531aaa741ba5dce559"/><dir name="Interactive"><file name="InputHandler.php" hash="d3145719246800d1376e1f1ef4180e49"/><file name="InputInterface.php" hash="82d2f1f9279a2d7ff4362ce6b6d8157d"/><file name="InputRequest.php" hash="c3a6fbeb3fc7982b109e591ea1e60583"/><file name="InputResponse.php" hash="54d1d07df9f04ef3a641d369afa2e7cd"/><file name="OutputInterface.php" hash="601647b578c31aaf1a126e53fd2fa1c0"/></dir><file name="Manifest.php" hash="b8dff8d7a247ef263c51880ea594a892"/><file name="Request.php" hash="a89bc839e2aa04663fcc3254d33f04d5"/><dir name="Response"><dir name="ContentDecorator"><file name="Interface.php" hash="efc2818e6e2450b7960928bf0939162f"/><file name="Separator.php" hash="be02f487a1b371caf242efa02993e04a"/></dir></dir><file name="Response.php" hash="1ee8b16433ba60c967dd0bc73f9138d8"/><dir name="Storage"><file name="AdapterInterface.php" hash="c88b828f7e8c87dfce10966ec146315f"/><file name="Directory.php" hash="85ba876e0ad0b9da4b60fb69d8050d5a"/></dir><file name="Storage.php" hash="7ead4c675fc854fa6c1cc2e62595493d"/></dir><file name="Exception.php" hash="191ad6d4769d7b6e79bc8c048b5f0e02"/><dir name="Loader"><file name="Abstract.php" hash="ab4cc504a1834280599ca2e51ccb5ffa"/><file name="BasicLoader.php" hash="5cd54233dfda6020252ea37eb9a0aa3f"/><dir name="IncludePathLoader"><file name="RecursiveFilterIterator.php" hash="7dc579ae533df76f96bea8891466141a"/></dir><file name="IncludePathLoader.php" hash="4b01d46b6595410f6007ab6c6eaf1799"/><file name="Interface.php" hash="e8a2424dc5c6ab4b76b21bbd8ff1313f"/></dir><dir name="Manifest"><file name="ActionManifestable.php" hash="578fd545eb713534a06765859b95bff3"/><file name="Exception.php" hash="f52ba3668e7ea604cd98c66b5afd6aef"/><file name="Indexable.php" hash="5d14a219bbd89099778fa1a5fd1eec3e"/><file name="Interface.php" hash="3cf36f0cf9f5a9014afef3ec0a43fab7"/><file name="MetadataManifestable.php" hash="7914e8be98fb11aaad72629b05913afd"/><file name="ProviderManifestable.php" hash="d0f8176954fafd848ff8a899e5bdb394"/><file name="Repository.php" hash="c3ecd5da19898c84037779579547962b"/></dir><dir name="Metadata"><file name="Attributable.php" hash="6c1af90e07b5a53cc657607b19cd6938"/><file name="Basic.php" hash="3be79c0971137eff9668e88b2e966c98"/><file name="Dynamic.php" hash="62860f064b6581febc6038ee231e1f18"/><file name="Interface.php" hash="d4ce89223385ff49ae76832442737e0f"/><file name="Tool.php" hash="37931dff0f20654e7b37dc9b9f60f96f"/></dir><dir name="Provider"><file name="Abstract.php" hash="1ee53b8c194a15d77379c5f6022c5621"/><file name="DocblockManifestable.php" hash="2c401859545144eee4eba1c9f2a8da11"/><file name="Exception.php" hash="d918d7df7829bda50f77bbdb482c26e2"/><file name="Initializable.php" hash="1add381a29572e8c2ffe2d1b80dbf925"/><file name="Interactable.php" hash="f3ad8da3bd31feb9d05f84f3cea415ce"/><file name="Interface.php" hash="248c097239e80aa10eaef49998e9161b"/><file name="Pretendable.php" hash="45f0852186ca83b17d097dd3665fd0d6"/><file name="Repository.php" hash="f289673d4e033c31634a791074b54c5e"/><file name="Signature.php" hash="9acb46377359fc3d48566425a796c74a"/></dir><dir name="Registry"><file name="EnabledInterface.php" hash="98b6357e03c949387e0d2a28b300eb55"/><file name="Exception.php" hash="a052f63fdef2b5230ff084d8e7b60230"/><file name="Interface.php" hash="a2251c667f6e869c4f3b3531d779d3c7"/></dir><file name="Registry.php" hash="9b9763a1559b25e27c8fde45c1c080b0"/><dir name="System"><dir name="Action"><file name="Create.php" hash="2830bf210e2a9df3c4109ed824584d73"/><file name="Delete.php" hash="88617fecc1439e1d6bf8922880ff5c53"/></dir><file name="Manifest.php" hash="250dc52ab206eeccbc6f540b9617ad82"/><dir name="Provider"><file name="Config.php" hash="a1e6979061bfa8c0605a4d7ae7b80095"/><file name="Manifest.php" hash="103cb26ba2b25b3f84c94dfb5c22b356"/><file name="Phpinfo.php" hash="3526e5c805460ba5166645c140101c71"/><file name="Version.php" hash="1c200e73958feffb4877c1372a1a9bf1"/></dir></dir></dir><dir name="Project"><dir name="Context"><dir name="Content"><dir name="Engine"><file name="CodeGenerator.php" hash="233d1b1c79118ea6480f0c7f887abca3"/><file name="Phtml.php" hash="eaf67f68d43d0c2dba1469f603106178"/></dir><file name="Engine.php" hash="d4d6bd30373b501ad4fd3b67bd9b388d"/></dir><file name="Exception.php" hash="f35ef822435e9c07305fb2176bf8efe2"/><dir name="Filesystem"><file name="Abstract.php" hash="d7e5e84bdbd68a57a64483c3ff571d12"/><file name="Directory.php" hash="964ceaed822502baa453f3b1ae856c99"/><file name="File.php" hash="b0aee9411be676fb4a1fa861f7c248ab"/></dir><file name="Interface.php" hash="6443631680875499260e6e04c5649b8e"/><file name="Repository.php" hash="788911da539a984cb54742cdb39540e9"/><dir name="System"><file name="Interface.php" hash="512834f2866a8e9989ce43df9080567d"/><file name="NotOverwritable.php" hash="2c2accce4c4455b2dc2601aef7345232"/><file name="ProjectDirectory.php" hash="3f9d3858af19801b5bc45a4ea05533f9"/><file name="ProjectProfileFile.php" hash="f0882f53c581b8d9954a17416c26f09b"/><file name="ProjectProvidersDirectory.php" hash="29e5dad7a2828c3b996972e993a2aba1"/><file name="TopLevelRestrictable.php" hash="776d892d1b1aa50bcf61d24bbb21113d"/></dir><dir name="Zf"><file name="AbstractClassFile.php" hash="49da46bd028aae35033cc9eaeb74e170"/><file name="ActionMethod.php" hash="18f8a10c4f54bc19c7761f4ce1796f82"/><file name="ApisDirectory.php" hash="ed8b3b75da08241f239dcd3b63c59dd1"/><file name="ApplicationConfigFile.php" hash="9e0715fe3235630548ea7cbf3e7fdb3c"/><file name="ApplicationDirectory.php" hash="a17886eb56264d5f5c05e4a904df4d97"/><file name="BootstrapFile.php" hash="d4926afa1b01cd1e148d4efe88f4ef2a"/><file name="CacheDirectory.php" hash="8ace607a113f523e11e2badabce9bfdc"/><file name="ConfigFile.php" hash="246ed968b2abc5ce68fcbfa7602ce29f"/><file name="ConfigsDirectory.php" hash="917a22899db45ce527548e6a923b90c1"/><file name="ControllerFile.php" hash="6084c1392f377b56e0bac19d0eba9f00"/><file name="ControllersDirectory.php" hash="a6cd3bf7a017d06e19f49f461ad8b98c"/><file name="DataDirectory.php" hash="983d904985337b649d69d0ab395d0464"/><file name="DbTableDirectory.php" hash="6038d43b77129904455676c3d6b6dc54"/><file name="DbTableFile.php" hash="7a15cfe28bda45e813785860c1d1747f"/><file name="DocsDirectory.php" hash="0eadb3225fea40b894876dbcc9ad96fe"/><file name="FormFile.php" hash="3e11ce78fc9f02d8f548fc445233890f"/><file name="FormsDirectory.php" hash="04f74a7ea2f094dba6e0678fe0783c53"/><file name="HtaccessFile.php" hash="2518f0395ccc3b2738cbfc39fee5e77e"/><file name="LayoutScriptFile.php" hash="4e2e5c2e138dd641d18b0bc3331ff530"/><file name="LayoutScriptsDirectory.php" hash="7f418b8b53c1ae0724b38f92b0bae5cb"/><file name="LayoutsDirectory.php" hash="12ef832e1ebc79bc2b1338b02ecd3ece"/><file name="LibraryDirectory.php" hash="9134c4f098132c43f6858831b3dec4eb"/><file name="LocalesDirectory.php" hash="e22688d61976b562c6badc8d7c3f5eeb"/><file name="LogsDirectory.php" hash="1c6c1904591b8b7c6794b2d81d9daed9"/><file name="ModelFile.php" hash="128813a6bcb06217c4f0dc0ab74616d2"/><file name="ModelsDirectory.php" hash="177d45117cdf6508373e3d86996ab916"/><file name="ModuleDirectory.php" hash="c2d0d31e5d5ca73b28f2dd824cb2b38b"/><file name="ModulesDirectory.php" hash="0859e1112c59954ad95524c10a1eab04"/><file name="ProjectProviderFile.php" hash="14f927072c9f94b2d8e2838b0ca34025"/><file name="PublicDirectory.php" hash="d6d7cfc9a7f0168f40010819f70972ec"/><file name="PublicImagesDirectory.php" hash="550232003b9f41aff6710a64c1b4650e"/><file name="PublicIndexFile.php" hash="1e81b428b14462027fbde5bb66205395"/><file name="PublicScriptsDirectory.php" hash="3de687f2a856dc3805ed2be9588c0eb2"/><file name="PublicStylesheetsDirectory.php" hash="427c1a3aa25ce6521c0f08a222eab85c"/><file name="SearchIndexesDirectory.php" hash="f49639b7e755bc2788b2fcba978d00db"/><file name="SessionsDirectory.php" hash="94d01f7136fa86fb2764bc5e2a4f5bab"/><file name="TemporaryDirectory.php" hash="15d621db047a596eb871c66da65017f4"/><file name="TestApplicationBootstrapFile.php" hash="c530b85b31673cd91a489f650ab4414c"/><file name="TestApplicationControllerDirectory.php" hash="578d0285ede9763028335b77567f39aa"/><file name="TestApplicationControllerFile.php" hash="8e8b61b6059687105ea574d9d7b42541"/><file name="TestApplicationDirectory.php" hash="45916b1dad5afc7e93ae71309af8892a"/><file name="TestLibraryBootstrapFile.php" hash="96c60705bcf507a3a6db6ca5e15548b6"/><file name="TestLibraryDirectory.php" hash="e9ffdeef43f49c452a159186b894526c"/><file name="TestLibraryFile.php" hash="d8401a9c91dba4f2694cebd6b3cc1d6e"/><file name="TestLibraryNamespaceDirectory.php" hash="417338a6db14e69837cdf1fda41128f5"/><file name="TestPHPUnitConfigFile.php" hash="298741d342d7421998cb784b31354236"/><file name="TestsDirectory.php" hash="0065e61dc7d98bc4fb5714ea2ff37d93"/><file name="UploadsDirectory.php" hash="9e979f9cb13b602d9ffd11538c62498e"/><file name="ViewControllerScriptsDirectory.php" hash="17ccd5f3367a1b4a642e5a8eae4d52a3"/><file name="ViewFiltersDirectory.php" hash="60c1ecc9ae858282d4b19f210cb9d8da"/><file name="ViewHelpersDirectory.php" hash="8ab9cec263392cff3250292d0f16853c"/><file name="ViewScriptFile.php" hash="78b28c15e5552c46e44d80373057b2a3"/><file name="ViewScriptsDirectory.php" hash="b49c873097a660bc0c2c807d4c70b081"/><file name="ViewsDirectory.php" hash="2233e55f69d9528e44634ed7b030d7a5"/><file name="ZfStandardLibraryDirectory.php" hash="fe33ae0b62a07bb8db276c61fce477ae"/></dir></dir><file name="Exception.php" hash="acb1253e9fea08c95c762749cf560185"/><dir name="Profile"><file name="Exception.php" hash="efa8b065dcb9e335cf31318c75d63800"/><dir name="FileParser"><file name="Interface.php" hash="ba7fcba10077c529824a1c5a78c47bee"/><file name="Xml.php" hash="1841f55070c094fc04a5e1bb429c9dbe"/></dir><dir name="Iterator"><file name="ContextFilter.php" hash="3fdceee5380da3bafa30139bfa5a38a4"/><file name="EnabledResourceFilter.php" hash="fce2852b39a4887dd2e1f962b989caa2"/></dir><dir name="Resource"><file name="Container.php" hash="fac3e3f16634a209e880bec6b6090925"/><file name="SearchConstraints.php" hash="121d92f3a9c54ea8729058aab7a12029"/></dir><file name="Resource.php" hash="0457a1d7734f8d02a22596c37b6c7593"/></dir><file name="Profile.php" hash="0367a18b4979f7d9b9700c41f7af7f59"/><dir name="Provider"><file name="Abstract.php" hash="dec0112b07a3ffcd42cd3f2ca60457fd"/><file name="Action.php" hash="3ffa132c2fee19790007729ef0b39400"/><file name="Application.php" hash="6e9ad0a1701805a154d66f73e6e47b01"/><file name="Controller.php" hash="e8389ff41e65d6a2d59fb41b8146bc75"/><file name="DbAdapter.php" hash="372171dd9d8621b0855fcd73eb9b137a"/><file name="DbTable.php" hash="1a3da14e7bee5b4ca6d1e500b36182fc"/><file name="Exception.php" hash="0612885b2ff332b069c07f300ef8f5ed"/><file name="Form.php" hash="235e406cf4f309df7593d6b62f36532f"/><file name="Layout.php" hash="feab26115c147f8967390b43e2882341"/><file name="Manifest.php" hash="fb93153529ceeb85fdc61da89a47e907"/><file name="Model.php" hash="0cf6663cb7e9f41633bf8e4148b1680d"/><file name="Module.php" hash="3da2e80f00a426c24e1f21ade7d973ed"/><file name="Profile.php" hash="3323e3ce970ee1f5e35a3e3e586d2e5f"/><file name="Project.php" hash="6e583374d5d1504a440ba992f72d19fe"/><file name="ProjectProvider.php" hash="0300ed6c8f300e01058a5e9b7de4a50e"/><file name="Test.php" hash="c53bdebe74662a88d808e9d9868b707c"/><file name="View.php" hash="fe7ea80c4a7df7498e47616f2bbb4b67"/></dir></dir></dir><dir name="Translate"><dir name="Adapter"><file name="Array.php" hash="624495ece269b7f3060a48987392d4c8"/><file name="Csv.php" hash="9ba8234576e67c9100d283736d00a2e7"/><file name="Gettext.php" hash="a6b4028b23a834fef06fa111f89dc2ea"/><file name="Ini.php" hash="cae8e2a4a38195c2effdb7cb8af3a9a5"/><file name="Qt.php" hash="c4751d00c67b90ecb734a37e7119e535"/><file name="Tbx.php" hash="35947eef3ed1c32e8edd2fcc0ae1a02e"/><file name="Tmx.php" hash="4d93ee73c3eced8f386e3285b9a8570d"/><file name="Xliff.php" hash="7110c11588d46fdedeaf77b9c7c3f4ef"/><file name="XmlTm.php" hash="f12240d492a25b929ffa420759ac9360"/></dir><file name="Adapter.php" hash="87c632e00e94a794007ba528fd2fb4c6"/><file name="Exception.php" hash="dbce647c451f635ac7dd2847a89fcdbe"/><file name="Plural.php" hash="f94899402422d9bb06fa4cc3da3e9ed4"/></dir><file name="Translate.php" hash="ad818547a50732aca66bbf04eae3ea5e"/><dir name="Uri"><file name="Exception.php" hash="25e93d61e091f4189f1354ab8756305d"/><file name="Http.php" hash="52b92f6c785c6618a6813221edb13467"/></dir><file name="Uri.php" hash="212fe4ffdeab2e93e91e98220cbeae88"/><dir name="Validate"><file name="Abstract.php" hash="38e8bacf2e3e231f097507ca8f5451c5"/><file name="Alnum.php" hash="9c4972edefe9bd44a472ed0dbb5c041c"/><file name="Alpha.php" hash="c696bd3024ac1e40c8150a7036c7d2ad"/><dir name="Barcode"><file name="AdapterAbstract.php" hash="2b4f7637a4261b00a0282da5c59360a9"/><file name="AdapterInterface.php" hash="947cba52bfb7ff0cdaccedc3b41ef095"/><file name="Code25.php" hash="1b0ca1f2b7eafddb94f245887077a78d"/><file name="Code25interleaved.php" hash="ec005dd7d58760b28bb6405023b8427a"/><file name="Code39.php" hash="c9bce04f3cae2e0ca9e15e809f744586"/><file name="Code39ext.php" hash="bd933b5a19cb114661eab9b60df26e81"/><file name="Code93.php" hash="77d5dc780959948d7e06cbba9783ce7a"/><file name="Code93ext.php" hash="8d2d48794967666ec7085dd6e0bd39a2"/><file name="Ean12.php" hash="d4ff0f4453b0a7727c79214e3f603a66"/><file name="Ean13.php" hash="b1fa50b2163c84c408cb4d00d80b6660"/><file name="Ean14.php" hash="56f2236b5d9d8ebd838436216b2ba9e5"/><file name="Ean18.php" hash="7fa08009ad60282f3531a9eac2eaa864"/><file name="Ean2.php" hash="07d44a4b17ce456968e47db193012f6c"/><file name="Ean5.php" hash="e05871b140fe5c5e35238ddabfba91f9"/><file name="Ean8.php" hash="aef63d808433a9149687a12911e2dfb8"/><file name="Gtin12.php" hash="4731c632a8c0a75a6d924f9ad69da464"/><file name="Gtin13.php" hash="17a5f633abc88df12c9095115fc52f76"/><file name="Gtin14.php" hash="422e5c52e420d7729ee624a306dd0dfa"/><file name="Identcode.php" hash="ff14b0c3dd63358520b6eba5045b93d8"/><file name="Intelligentmail.php" hash="3cb2cf3e941bfe6fc2f43ba6fb7d14fa"/><file name="Issn.php" hash="4c01101c0a0a36e9092d6207a7ccab52"/><file name="Itf14.php" hash="671aeac88153653557f8200e332e2d03"/><file name="Leitcode.php" hash="6dc2a77674b85f1cdfc2102c7c0743db"/><file name="Planet.php" hash="7e6ad342c133a9adcb4ca63c0595c092"/><file name="Postnet.php" hash="0187934fe26057eafccba1bab1ac8396"/><file name="Royalmail.php" hash="3c9b0a7545dbbd68809b16633469ea4a"/><file name="Sscc.php" hash="bada965bdb9086e89999f33de19f8bce"/><file name="Upca.php" hash="9f5a048de047a4f8f0807f0f1079b845"/><file name="Upce.php" hash="d35dab9638e84f8c17b1ed0bb596ca15"/></dir><file name="Barcode.php" hash="b0d1abf1b74c9aceaac03975779e9751"/><file name="Between.php" hash="695fcd6e2a8c51c18bca36ac2862d0e2"/><file name="Callback.php" hash="bc5c5f7617e67157bdbb1b4fd3df6682"/><file name="Ccnum.php" hash="046e20b3a2b2db9383b49386c9484749"/><file name="CreditCard.php" hash="08b23f908ab309b2c4f9a02343d7b2df"/><file name="Date.php" hash="0d27a27c84ab95fe8d287307702b53b5"/><dir name="Db"><file name="Abstract.php" hash="9c0b3151d18611bc137b2a0245b8048e"/><file name="NoRecordExists.php" hash="2b06cc60ffd3923e5fd4cf75ff117ef5"/><file name="RecordExists.php" hash="715b394806cd110938bf5e50bc8c18c6"/></dir><file name="Digits.php" hash="807ce96e61bcae92715172445a4e0cf4"/><file name="EmailAddress.php" hash="de4d5af3084538410e6d98fba66602de"/><file name="Exception.php" hash="c6431cae5e44bec5bd43cb679532c923"/><dir name="File"><file name="Count.php" hash="d7c226a7076bcd4cb3205740648c7772"/><file name="Crc32.php" hash="903239d84efbc9e79f179285124e1119"/><file name="ExcludeExtension.php" hash="0321619f7bf1c4cc9bfb3a6275a1261f"/><file name="ExcludeMimeType.php" hash="772b744f3ca6e0f452f224a9d030ab85"/><file name="Exists.php" hash="73c51917f4d16adff496e9b8bc01bef8"/><file name="Extension.php" hash="cb467504350b3f60a12109cffa1378da"/><file name="FilesSize.php" hash="ace6dad8429271c516c74441bad36fd1"/><file name="Hash.php" hash="1a47d69b6776906143452b5c6bfa4635"/><file name="ImageSize.php" hash="9e45d766e06b05e5fb749bb44a3db60f"/><file name="IsCompressed.php" hash="ad40d6cca8cd616ed5c9881936e52fd7"/><file name="IsImage.php" hash="b53cace20bd31719e1a7ebcf3fa28c9c"/><file name="Md5.php" hash="a5b310b28fbae5cd33f816220e97054b"/><file name="MimeType.php" hash="da03ecd32c2c4fefbf90ea5d2e240c14"/><file name="NotExists.php" hash="022a9e234cb719b28b0084fe09188a98"/><file name="Sha1.php" hash="14743e03f4e85e453af4c9869a44999f"/><file name="Size.php" hash="316afdfc4c5983ee1de60265f7f41fb9"/><file name="Upload.php" hash="c412016ea56be52bbcc534f749f65159"/><file name="WordCount.php" hash="ce5669d8f77579a0aca08b405a04968c"/></dir><file name="Float.php" hash="17e47818700e83bba247a56b77bb0d7a"/><file name="GreaterThan.php" hash="ddf85f8676bab58ec4a7090377834abe"/><file name="Hex.php" hash="e0fec2f7430573c939780672d1b30795"/><dir name="Hostname"><file name="Biz.php" hash="24d4519c844b67dee73714ab71a47e34"/><file name="Cn.php" hash="019c30a8df10acda26c2955fd1202101"/><file name="Com.php" hash="aade9f1dccda1d9f1dfcab37254e6703"/><file name="Jp.php" hash="f788b032df94a303d3627bfe8e34a54a"/></dir><file name="Hostname.php" hash="1323063eb7c23f2789d42ef0318bcff2"/><file name="Iban.php" hash="29026c2b94cd7fdf97c5e042e647ec2d"/><file name="Identical.php" hash="d662d5059908e7f2324d5cbf85819e06"/><file name="InArray.php" hash="ff6afc71947ddab397e312685d9fe3f9"/><file name="Int.php" hash="22fd47b661cba6deee6b29fb7c5f03c3"/><file name="Interface.php" hash="ab2e7382393e34371471d23454ceaed0"/><file name="Ip.php" hash="b1901e81c0e34e38f5cfed889d9fdeb1"/><file name="Isbn.php" hash="c3708a5c7cdbf9ae3b2665b0fbd8cafd"/><file name="LessThan.php" hash="b99785345f1d8626f8a58b45e0e8fae3"/><file name="NotEmpty.php" hash="c2909b95b96045188641c953078fc469"/><file name="PostCode.php" hash="3baac72e7780629c108dcaae76e460e9"/><file name="Regex.php" hash="dd89a31b4298aedcd6fcd3cb421273ec"/><dir name="Sitemap"><file name="Changefreq.php" hash="291b6d3ff67be2238e4f2461a8cbbebe"/><file name="Lastmod.php" hash="55d0ac3a564362c24e0370b851114c12"/><file name="Loc.php" hash="f923f318883cfde37214b8ad8aad56e8"/><file name="Priority.php" hash="cf34438d225e0da0e07952bf560318fb"/></dir><file name="StringLength.php" hash="16866bcd4f0e086c389653873ffbdee6"/></dir><file name="Validate.php" hash="4399b0fd91277425ba37d7ea63ae91af"/><file name="Version.php" hash="513493be125afb971d67065fa19b9c06"/><dir name="View"><file name="Abstract.php" hash="c84ce1d426d8bd7de21296364d15f34e"/><file name="Exception.php" hash="b5a3e0a777928ee61b1cf25dabb787e1"/><dir name="Helper"><file name="Abstract.php" hash="f3bf296c7cdb998c135c99cfc0b2a98e"/><file name="Action.php" hash="967ef353f3e5eb348532936d09e46099"/><file name="BaseUrl.php" hash="fce077945f0acd32834100c03046837b"/><file name="Currency.php" hash="99055e7f6f5f3b4cee41ca760a978b10"/><file name="Cycle.php" hash="49c3d07896b7efb8695aab086d0128a2"/><file name="DeclareVars.php" hash="c73ad84508afa891f6dc719614004e1a"/><file name="Doctype.php" hash="97b3a78241141e3ef9715a7403d711a7"/><file name="Fieldset.php" hash="54d8e4c2f1ab90464204a33dc427bb6b"/><file name="Form.php" hash="88b8c6b9695ce236839cfd169437cfc2"/><file name="FormButton.php" hash="4351c4236498467fffca6e52d150bbb7"/><file name="FormCheckbox.php" hash="faf57b12e07745c0a1f4699259385031"/><file name="FormElement.php" hash="41f041da8e79b5719982c67032bfad6f"/><file name="FormErrors.php" hash="da192b83b6bde9cbc32f136264956fb5"/><file name="FormFile.php" hash="97f22afad07330561a90798bcbcf61ba"/><file name="FormHidden.php" hash="2433c2cc7145e06cf76527cf26fc7b9e"/><file name="FormImage.php" hash="56912d14c72a05b873c056d8247231ec"/><file name="FormLabel.php" hash="409da0f60b44418e8d085466d41d8f6d"/><file name="FormMultiCheckbox.php" hash="3a1a2cf798789c49e47a45852dcee6fd"/><file name="FormNote.php" hash="2fa9b3af2cfcd91864e681b89fda8cd7"/><file name="FormPassword.php" hash="2dd6d21bb663460650f672dc6135bebc"/><file name="FormRadio.php" hash="5f9249d0960848e877b53aac7b2b6205"/><file name="FormReset.php" hash="6f07147f0abb44838bef3efef687d967"/><file name="FormSelect.php" hash="df4c6098f2370e9f1102dd9e6892192d"/><file name="FormSubmit.php" hash="9ab0c1f27f22c6920b86b7c24e2ceee1"/><file name="FormText.php" hash="49bacb5d684dacd70efe7594d4a98a53"/><file name="FormTextarea.php" hash="aa35b9194c1ca8e02e3875fd12252aa2"/><file name="Gravatar.php" hash="e6b16422147531fd74e6acf6ae946064"/><file name="HeadLink.php" hash="854519b7255dbc4ccff71c28195c48d9"/><file name="HeadMeta.php" hash="81f79cee28fa5f26d4af8f323033b241"/><file name="HeadScript.php" hash="bbde08465d66813e16f0857880179129"/><file name="HeadStyle.php" hash="b72a6ac81b92db811654e2c176fc0f2c"/><file name="HeadTitle.php" hash="2ef9b83c9a6d328f42f4c4842480c9dc"/><file name="HtmlElement.php" hash="ed5a6de066bd6d8339d51ba75fc0b2bf"/><file name="HtmlFlash.php" hash="539860f16ba6ead6ec147f12a371452e"/><file name="HtmlList.php" hash="915f1909ce207299cb78b3e77f20a966"/><file name="HtmlObject.php" hash="b399447a0eaa3260191319e8ea11c46f"/><file name="HtmlPage.php" hash="f19ab0ff49a85e80fc3bf350615ed889"/><file name="HtmlQuicktime.php" hash="dbfed321c27b7963854141ef17c4163e"/><file name="InlineScript.php" hash="1bbf126751b9b33da1d4c129ee08c8d3"/><file name="Interface.php" hash="f1a636c66a7135c40268ca31acbe5ead"/><file name="Json.php" hash="1b52e1b6a3e2b7feb5cab31e5d2b30bf"/><file name="Layout.php" hash="be84f18a98aa78c26cb9c08853c0c534"/><dir name="Navigation"><file name="Breadcrumbs.php" hash="6c78bd226ac3d33ce095a44e99399b59"/><file name="Helper.php" hash="5b676611f9a4ac5f9decc40fda810bdb"/><file name="HelperAbstract.php" hash="ed00e87d3d846a31cb651c4a977d4f27"/><file name="Links.php" hash="139c9a2c42f2ba2b50038f0aa33caea4"/><file name="Menu.php" hash="ad2dba2af0566dde40227fcff9c45ed0"/><file name="Sitemap.php" hash="4cd47aa9da42882c66f49630c2d9ffa9"/></dir><file name="Navigation.php" hash="00856d71412794c661a90e2775ea9164"/><file name="PaginationControl.php" hash="3f6e008b19a985d711853463c60108f6"/><dir name="Partial"><file name="Exception.php" hash="807a6724632d2181edea375e9bddd245"/></dir><file name="Partial.php" hash="0b398c53cccc245aa86cb90b36539bf7"/><file name="PartialLoop.php" hash="6c5f5fae73c66e4bfddd548aa20dbc56"/><dir name="Placeholder"><dir name="Container"><file name="Abstract.php" hash="dfb6604d212790747279f6ad78188abb"/><file name="Exception.php" hash="5a27b2be1cb1c7edad8cce39328f7103"/><file name="Standalone.php" hash="891b9e701ab1ab07f8705e66241097ec"/></dir><file name="Container.php" hash="98bbef91195e01a5ad9930f111bafafb"/><dir name="Registry"><file name="Exception.php" hash="65912a31362a51cf8bccec8c31390443"/></dir><file name="Registry.php" hash="e9b558a3810592d8d0babdc18c9f611b"/></dir><file name="Placeholder.php" hash="ebb88ccd144d77b5517bd61f90964d24"/><file name="RenderToPlaceholder.php" hash="b8d428a74a3560337cba6888704792f7"/><file name="ServerUrl.php" hash="d3d6f6a6716d7fbce37c88dac5cf7bb3"/><file name="TinySrc.php" hash="b21560cda82fee8149643af10e77c2f8"/><file name="Translate.php" hash="7fe912819597b092025458d998bf0444"/><file name="Url.php" hash="b9bcdd3b318f9df41d2e411aba185060"/><file name="UserAgent.php" hash="1d76592df7b33b88a3e6ef1376fe51f6"/></dir><file name="Interface.php" hash="4ccf287c6bf53f008b424df20dbfbf0c"/><file name="Stream.php" hash="9bb5882a9fd146a64c9013a1bc444242"/></dir><file name="View.php" hash="49b46d856245f2ffbff1f7732c9e40df"/><dir name="Wildfire"><dir name="Channel"><file name="HttpHeaders.php" hash="f470af8201acbaca8e869e441909e921"/><file name="Interface.php" hash="add66f57e51c6aef7073085714e00554"/></dir><file name="Exception.php" hash="ffa4e0e3f898121eb4fdaf1bdf7cd8ec"/><dir name="Plugin"><dir name="FirePhp"><file name="Message.php" hash="462dc66fc851207379f768bb419d346e"/><file name="TableMessage.php" hash="0f4d5410bc956c3a280deafdd1b76e9b"/></dir><file name="FirePhp.php" hash="4c3aaad02716cf77c7709aaafb275679"/><file name="Interface.php" hash="7cd6a75dce7aa8966b7851b4bdf56404"/></dir><dir name="Protocol"><file name="JsonStream.php" hash="0c3b870bb5f5ceea0dc6b947b289d20b"/></dir></dir><dir name="XmlRpc"><dir name="Client"><file name="Exception.php" hash="2aee5a461c5f0ca987e18461ee362dcc"/><file name="FaultException.php" hash="be61ced5629db063a270a50e10ee6190"/><file name="HttpException.php" hash="12826567b419bd2f1da833f5a6947016"/><file name="IntrospectException.php" hash="9a3c952c449fe585c9de41bd31796980"/><file name="ServerIntrospection.php" hash="e910b77e592f23354aa09403e137b51c"/><file name="ServerProxy.php" hash="75042802c778e936c3eaf3367dd2dbe3"/></dir><file name="Client.php" hash="686c5e383f8d568fe11b451ea9aae99f"/><file name="Exception.php" hash="4df9c2deaa89b5b988010c403dc92040"/><file name="Fault.php" hash="4e6060144939bc239b1978e3a0ba3651"/><dir name="Generator"><file name="DomDocument.php" hash="388b3e4e617092dba034feba758b8ef2"/><file name="GeneratorAbstract.php" hash="07bb24e5140c8e0924321ff754b1f2e9"/><file name="XmlWriter.php" hash="2a6fdffd20abbd7a755ca1ee85f3d86b"/></dir><dir name="Request"><file name="Http.php" hash="70dfbc157fb1659dc72d89b6a0a8c794"/><file name="Stdin.php" hash="aba2a6dfb903b64c016f4cbf682c6e85"/></dir><file name="Request.php" hash="c20090fd5ff218ddf1ff7d72a69202d1"/><dir name="Response"><file name="Http.php" hash="b45ab670875d23b555c195c33b96ba24"/></dir><file name="Response.php" hash="d42cfffebe32b9880f1c31b13a21bf3a"/><dir name="Server"><file name="Cache.php" hash="088f3e8a47073bbf6bce0a61eb9a40f1"/><file name="Exception.php" hash="cd83e0bf1d97f29a95f640f05934a90f"/><file name="Fault.php" hash="396516b43cc0ed13d5b7eca346f88e6d"/><file name="System.php" hash="3f91382cb17318b9219bfa59b83c0cbc"/></dir><file name="Server.php" hash="766e914bbe5bb075e1166fcc9c6f3112"/><dir name="Value"><file name="Array.php" hash="a852173e34a9f1c216f9678e52335f0d"/><file name="Base64.php" hash="7a01ed9b36230dfb13224edbbc29dd99"/><file name="BigInteger.php" hash="ee13d93bf1caf3cba30d624f61a6214e"/><file name="Boolean.php" hash="2bc2887b7994dd0e6b6584bca70e163a"/><file name="Collection.php" hash="8d8922c79c29ba6886c34c79fc504e90"/><file name="DateTime.php" hash="347b48e7f7df485843aa730bead4212e"/><file name="Double.php" hash="3e3d0f4b1542bedf24ac786cc5c0326a"/><file name="Exception.php" hash="53d36a13f405149f08a234ecc44ec089"/><file name="Integer.php" hash="214724554c7b0100190b3b38a134be17"/><file name="Nil.php" hash="c5ea093f2506967fc3056905a3463529"/><file name="Scalar.php" hash="198db13c08422b19cb7086d70cc7bd09"/><file name="String.php" hash="246c6da6a9b16248b775eddc634540e3"/><file name="Struct.php" hash="c4508a8566ec0211b6ba4dd26a2a20a6"/></dir><file name="Value.php" hash="6b075fb9887e5c298722e20c150408a0"/></dir><file name="replace_recursive.php" hash="e886103ea1f75208cc11780718aa3094"/></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Lib_ZF_Locale</name><channel>community</channel><min>1.11.1.0</min><max>1.11.1.0</max></package></required></dependencies>
-</package>
diff --git a/var/package/Lib_ZF_Locale-1.11.1.0.xml b/var/package/Lib_ZF_Locale-1.11.1.0.xml
deleted file mode 100644
index 0156773a77..0000000000
--- a/var/package/Lib_ZF_Locale-1.11.1.0.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Lib_ZF_Locale</name>
-    <version>1.11.1.0</version>
-    <stability>stable</stability>
-    <license uri="http://framework.zend.com/license/new-bsd">New BSD</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Zend Framework Locale</summary>
-    <description>Zend Framework Locale
-splitted from ZF to avoid memory overruns during installation and upgrades</description>
-    <notes>1.11.1.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:01:19</time>
-    <contents><target name="magelib"><dir name="Zend"><dir name="Locale"><dir name="Data"><file name="Translation.php" hash="5963920fd6ae02184a92f238a0ca61f2"/><file name="aa.xml" hash="bbdbfa435892a2baa2f1d3657355e199"/><file name="aa_DJ.xml" hash="75a6b5261c62689efcf6d57d17e515ec"/><file name="aa_ER.xml" hash="d8606c5b614150d1b7d8e943938442b5"/><file name="aa_ER_SAAHO.xml" hash="afc11539b6739d773c4263990ebd0ae3"/><file name="aa_ET.xml" hash="cffeecce4a64a60754165a259ac327be"/><file name="af.xml" hash="35170c24408a839285f9613a666dd7bf"/><file name="af_NA.xml" hash="853d03c7489add435081a72a8b366ab6"/><file name="af_ZA.xml" hash="d1da6ac08f4272ef4f83bce415c8b4f9"/><file name="ak.xml" hash="19e9874b42ba6feb36b43803a290c7e1"/><file name="ak_GH.xml" hash="28fec6276ad21df029aa49b3b2ddc148"/><file name="am.xml" hash="8f6586d7bf79b556ace64e14ad3fd264"/><file name="am_ET.xml" hash="61af70992febd328cbf7272065778950"/><file name="ar.xml" hash="b415511a5ce4fdac29d9ac7d6565edf6"/><file name="ar_AE.xml" hash="3a4f71d7047b62528075a1011b7b05e8"/><file name="ar_BH.xml" hash="cff9e9a6cdeb8a6b3ff830c4ac7026c8"/><file name="ar_DZ.xml" hash="e2e99621ec853cd6d30a39ffb359a748"/><file name="ar_EG.xml" hash="e0e9b08a06fb9efd70616dd0a3ea2b6b"/><file name="ar_IQ.xml" hash="ec69e499c017de339f7150f0beb269af"/><file name="ar_JO.xml" hash="64a856e15503c055be3d8baf76b8a998"/><file name="ar_KW.xml" hash="813145268388e1052698e7e18663b5b6"/><file name="ar_LB.xml" hash="ce25f64c68fd3590aea0bbdfac5c4862"/><file name="ar_LY.xml" hash="46cae1a94f5d1d51e010ec95a1841f60"/><file name="ar_MA.xml" hash="3bc5622907825992561ff68588faeb8d"/><file name="ar_OM.xml" hash="d46b4830327cdab456b65c6259849fb0"/><file name="ar_QA.xml" hash="3983d5af8bc039b6b3dfada3357afcca"/><file name="ar_SA.xml" hash="f0e08a1d2f714219188486f7cff528dc"/><file name="ar_SD.xml" hash="dff06f6ab5e56e720329d30e57c4ffdc"/><file name="ar_SY.xml" hash="05c035cd3299dc89690fa0688408580b"/><file name="ar_TN.xml" hash="f318748f9bf1fe6c4fa931344fb07648"/><file name="ar_YE.xml" hash="288d05f917ff9a900711880fa89a25d3"/><file name="as.xml" hash="ed59044961dc79c7480057eafa1d17f3"/><file name="as_IN.xml" hash="8488623e8c0c3105a0c98df708b23621"/><file name="az.xml" hash="e62ddd2c6a1b0d87ff8712b6a9c45d8e"/><file name="az_AZ.xml" hash="375d68113b4c52ba0445122db23c9cd6"/><file name="az_Cyrl.xml" hash="9392751a6e16e7006e5d2383468838ee"/><file name="az_Cyrl_AZ.xml" hash="f4fe173b3ef2097a88cda4efcc00581e"/><file name="az_Latn.xml" hash="030c97ce32f797b2ebfa540080f7d1ed"/><file name="az_Latn_AZ.xml" hash="1cb6a2d642f68d82f95f778370bdae9a"/><file name="be.xml" hash="76fcf7fc4fbe61e902b8991cc9d5bc0a"/><file name="be_BY.xml" hash="b10535da9eb809186725ec4a01fbe45e"/><file name="bg.xml" hash="3fc2817ac2d37103376103f6f7985181"/><file name="bg_BG.xml" hash="5f09566d578f2f0ac2018afa2bb46702"/><file name="bn.xml" hash="8cb2da251d544fb3d35736edfae5c9c8"/><file name="bn_BD.xml" hash="2e6ea345587054003764b3d1baefe9cc"/><file name="bn_IN.xml" hash="586f409074e0b4357bbd0899b15790c3"/><file name="bo.xml" hash="227a469f96a42ed16b2d1f4c536e6249"/><file name="bo_CN.xml" hash="61da3288c70fb9ae0a414a2084293ed8"/><file name="bo_IN.xml" hash="d83c87862347aac870c5af78f3e76ddb"/><file name="bs.xml" hash="64107c5b9726d390ce7efbec6b08e985"/><file name="bs_BA.xml" hash="883ecbb1f4d5710f6ae4c458e0161343"/><file name="byn.xml" hash="8cff36eb0d3583de7b8a9bb0f3db4828"/><file name="byn_ER.xml" hash="3087e8a4218811a29390bf14e7238409"/><file name="ca.xml" hash="56db1bb32d0b21d05ad5c906326daa64"/><file name="ca_ES.xml" hash="b83d606d9cc2e45203e35d8720fc8614"/><file name="cch.xml" hash="9b76c944acba781a86fd89859bb28de9"/><file name="cch_NG.xml" hash="cbee9897ba1a31ed5d4e197bb352b8d6"/><file name="characters.xml" hash="0489811c6b1e2ea4db225017bc4f659c"/><file name="cop.xml" hash="6ce34f53133f13e20c2c2a4b4cac2511"/><file name="cs.xml" hash="b5b8311a7cb848d3380847031a61f531"/><file name="cs_CZ.xml" hash="5a3293921afc25fa421ca3b4471e3b9c"/><file name="cy.xml" hash="0fe01a3a315fa93bfa815f31f7bd32a7"/><file name="cy_GB.xml" hash="a33383ed927c4b3fd00f88e90471ce6a"/><file name="da.xml" hash="90e41834bc718720888d18a18524d5ce"/><file name="da_DK.xml" hash="ea681d8f9ca9233331349c62e9fff0aa"/><file name="de.xml" hash="1f096e683b6e4af4d0645a8c251bf9b2"/><file name="de_AT.xml" hash="319569cf1c2e0638f2b8603c011ca0de"/><file name="de_BE.xml" hash="982053d7e4975f05fc015550763c0c9e"/><file name="de_CH.xml" hash="f44605c42756c778d3d0defce94c7d8c"/><file name="de_DE.xml" hash="e596de046ded89fdccb592e1f55a33e1"/><file name="de_LI.xml" hash="8ed27ea626ffbf9a3e9d4a6d696fe905"/><file name="de_LU.xml" hash="9f4be57d5cbacf817704c51c8a0ec1d6"/><file name="dv.xml" hash="84f1f93eb8041df74e3f576f1d475c63"/><file name="dv_MV.xml" hash="76ad1d3563336b895f8a6180f9f249ca"/><file name="dz.xml" hash="8d971d772c3b08088a3d95adfc2d7228"/><file name="dz_BT.xml" hash="eeeda9a4b77d974886df7eb3978a4b48"/><file name="ee.xml" hash="614136854427a3fa6ad2b4c7dc586980"/><file name="ee_GH.xml" hash="76caa990b8eada03d31ca83aad37b3dd"/><file name="ee_TG.xml" hash="438496c5c07d978f0d18fdfac9d82652"/><file name="el.xml" hash="7701a1bfb2356dccda2dbecf5f550513"/><file name="el_CY.xml" hash="005d80ef3e25b436bf26b6de8ca8742f"/><file name="el_GR.xml" hash="2ae7d941073382eb6ae8e34e07ca6e53"/><file name="el_POLYTON.xml" hash="e31731b869bc12875a6e3f43c3bf4e25"/><file name="en.xml" hash="ab0d3866b9fe749b280ab4d9daa3167d"/><file name="en_AS.xml" hash="2e35de787cf9eb927d3f98d473d87ca3"/><file name="en_AU.xml" hash="b3c941db86d3d8ce933395f1f4d32a09"/><file name="en_BE.xml" hash="9c6bf6784005261b1434a904514b1ee7"/><file name="en_BW.xml" hash="1de0defc79f18d89f5eee4d20b51e23e"/><file name="en_BZ.xml" hash="d26b692a9c378ac917d2e3eb2f212075"/><file name="en_CA.xml" hash="6cde7d6fa3e3a8422e7725d7efd183c2"/><file name="en_Dsrt.xml" hash="6368d99e2741186eb2e285e6bad440fd"/><file name="en_Dsrt_US.xml" hash="21320dcded6b7d9be8508cf3f74581a7"/><file name="en_GB.xml" hash="2cf53bbbb5dd7ce1e9d66110118fd63f"/><file name="en_GU.xml" hash="877e01f192fc6452a6c072ab49fe8792"/><file name="en_HK.xml" hash="e0bdcdfb140e676e444a60423708120e"/><file name="en_IE.xml" hash="095899ec5fb1386157856853551b40d7"/><file name="en_IN.xml" hash="4f659b7fef37c6a13b33a5a54de6b61f"/><file name="en_JM.xml" hash="eb7a382a310f51748d41e37f02dc744c"/><file name="en_MH.xml" hash="1015c02e21e5f36e9b2c7080094e2b1b"/><file name="en_MP.xml" hash="5b2466a590c61e2064c84d0444f75234"/><file name="en_MT.xml" hash="d935836b225630a883db8eb7acc8e2a0"/><file name="en_NA.xml" hash="70e2c2491c8af7c8da40afc565ed07fb"/><file name="en_NZ.xml" hash="4aa9f56ffba256bde2126653469e611c"/><file name="en_PH.xml" hash="f747de90b285f478f865e6e7b06f0789"/><file name="en_PK.xml" hash="9d7c9dacefcb1a83f477b4337347f733"/><file name="en_SG.xml" hash="93cf70843a11587ab46efed90505b919"/><file name="en_Shaw.xml" hash="017fe9749d27feb8e7f22d9602ecb1ea"/><file name="en_TT.xml" hash="02ef5df63a4b45bd1b82ad035754ad62"/><file name="en_UM.xml" hash="a4aa81d79cedb089ee987f0434eb98cf"/><file name="en_US.xml" hash="1ed18e62d4ae9e1c9d66164fdfdf7320"/><file name="en_US_POSIX.xml" hash="a5460e0acaf7638ea1a18420079664e6"/><file name="en_VI.xml" hash="c8b284cf472b538dde6d9be6b52616fd"/><file name="en_ZA.xml" hash="b241558af1a2b38dabc35f0a1b2f2549"/><file name="en_ZW.xml" hash="74dab54d6013a3bc7bd3af2dc047346d"/><file name="eo.xml" hash="fca399fa5870ddfd9613f11664c58e33"/><file name="es.xml" hash="8ddd9f42aebe9c8645a7952eaa5da970"/><file name="es_AR.xml" hash="9efb5a18c271a3be2401d2efaba00ffb"/><file name="es_BO.xml" hash="cb0e454985d10ef54da0e4bcb110f812"/><file name="es_CL.xml" hash="d806e2a5960945ad386911434fdd8ed8"/><file name="es_CO.xml" hash="bbc3e6db4b6bb12d040c7cdff95c68d0"/><file name="es_CR.xml" hash="213e1870d25f1435663cc5184e178d8f"/><file name="es_DO.xml" hash="d7bcedf2ea1a59793f458d6259bc6b81"/><file name="es_EC.xml" hash="d90b59d241c15394c1ca5bf1752fd943"/><file name="es_ES.xml" hash="ea59bb2182efd5614a63c0780f916372"/><file name="es_GT.xml" hash="8b706b4d8464bef7d9f7c9d9d76eb0c5"/><file name="es_HN.xml" hash="ae275561b014d6c39910758d3bca7764"/><file name="es_MX.xml" hash="a32cf656b0115c3e4490480438d0fccf"/><file name="es_NI.xml" hash="8fafdf71d4ca1a6286d0d5ac265183b1"/><file name="es_PA.xml" hash="5ef169c64fab995f0fd9ee344af2ee5d"/><file name="es_PE.xml" hash="c0b8a7acaf122763e0a8684ad4c3b226"/><file name="es_PR.xml" hash="6451e3ea3d8afcd133ab6db2077da2a7"/><file name="es_PY.xml" hash="9d717499b81d277c9cd124e1ee395869"/><file name="es_SV.xml" hash="af8c23f7e5087e286ad8aeedc12b9833"/><file name="es_US.xml" hash="9683facbfc7bdd68457dee294e179dcc"/><file name="es_UY.xml" hash="9cf439149e5157a5e733285aa18a8150"/><file name="es_VE.xml" hash="81282e0291910abafbf5c90fd8c0177c"/><file name="et.xml" hash="7a0a2bcc883a352d4b1e559c6d1edec6"/><file name="et_EE.xml" hash="838b41a34b65186ecfcf4298a9a22e41"/><file name="eu.xml" hash="0db0d8dcd71b382f43dd3309221ee3ab"/><file name="eu_ES.xml" hash="d98e9dbce5a02faa13598130511e0be7"/><file name="fa.xml" hash="ce588c6ffd0a5d9331268c2806193f5f"/><file name="fa_AF.xml" hash="57ca277de1b28ccaef080a58f0373160"/><file name="fa_IR.xml" hash="38060b519d60446812286f46eb33ae65"/><file name="fi.xml" hash="deb69c3d6c4ceeeb41bd5c5649c397a2"/><file name="fi_FI.xml" hash="35be71f13ad854093cb83727cc6ae3c0"/><file name="fil.xml" hash="aa4e1ab85edb3c9fec1950becb4f0779"/><file name="fil_PH.xml" hash="26ad615eaba0a83175928c788c9a2e07"/><file name="fo.xml" hash="e24f0d19f171983c2c7e830a7f53387e"/><file name="fo_FO.xml" hash="13e885fd871c7353c0ed3e4922725463"/><file name="fr.xml" hash="4b1228988f71c46efc86d48d5089d750"/><file name="fr_BE.xml" hash="2b1935cec3a440d3f38356aaa329b50c"/><file name="fr_CA.xml" hash="8dbf9fc7b8db3891c932e87581b133a9"/><file name="fr_CH.xml" hash="5a4528c7c2069456cea6cf1771a0e41f"/><file name="fr_FR.xml" hash="412271b1bddcbbe112b71b2b5ec96b95"/><file name="fr_LU.xml" hash="2351a6396ad90f331026103f9c8e0427"/><file name="fr_MC.xml" hash="a5dd7b34215445f65395a8d81054242d"/><file name="fr_SN.xml" hash="9c370f7886c20526a90a774b323159be"/><file name="fur.xml" hash="8700d43897d941d0b5b4636fb4888817"/><file name="fur_IT.xml" hash="348ff63119715d24ce4a58f8a3adccd8"/><file name="ga.xml" hash="cc1a5685830c146b7fe0fcd1518977eb"/><file name="ga_IE.xml" hash="89fc642150be9743e5ac3233d42fc6a5"/><file name="gaa.xml" hash="235648e0ae0cd081daae0acb50f866ad"/><file name="gaa_GH.xml" hash="d8b47ae51e42c1a7f5a2659c627f4c8a"/><file name="gez.xml" hash="f386220e35c8940dd79ecc59001b3286"/><file name="gez_ER.xml" hash="2b2c2e0179c8bce34361e08a276a07ed"/><file name="gez_ET.xml" hash="daf03efc7c8dbbdf9a1a59a15f470191"/><file name="gl.xml" hash="277b166dc07df9b5fdf25e57d20c7190"/><file name="gl_ES.xml" hash="941a98127c1c3814b32b6d0a4fb3f7be"/><file name="gsw.xml" hash="248a096fe056abf4178ea17912cb599e"/><file name="gsw_CH.xml" hash="341fcf3540c64189ec223ac5f8cc509a"/><file name="gu.xml" hash="1ceeca54b74bf1ba4dfb8dc386b14cc5"/><file name="gu_IN.xml" hash="d5cec32d8b54a7f57357f2003f267ae8"/><file name="gv.xml" hash="5e8b07896073b261929514384b2afc24"/><file name="gv_GB.xml" hash="75840ba1b0f795e6769706a1accb95cb"/><file name="ha.xml" hash="9327a7e1593d5112d0e520f71bade889"/><file name="ha_Arab.xml" hash="c277f7f4cb48c8c3ab9a2b142410624b"/><file name="ha_Arab_NG.xml" hash="33cec7be45a9dd2c98eb469f3a4ef4be"/><file name="ha_Arab_SD.xml" hash="a723c186760429d5c7e17e3f7b75cf6b"/><file name="ha_GH.xml" hash="af17b1ceaf6d20796c2734c499d3dfa8"/><file name="ha_Latn.xml" hash="97fb1258b38e05d97581d975673a844d"/><file name="ha_Latn_GH.xml" hash="4633af39da00dd4c62961dada729345b"/><file name="ha_Latn_NE.xml" hash="298fb3d91f49180135fcba40a89a15a7"/><file name="ha_Latn_NG.xml" hash="e8899e744f38ed9b3b5364126f72ddda"/><file name="ha_NE.xml" hash="cf6223ffb8dff905a5059c9fdb6b959b"/><file name="ha_NG.xml" hash="d60e8de191851b95388f159e00b94805"/><file name="ha_SD.xml" hash="5b51b2b80908335f1238ba77f50ba47a"/><file name="haw.xml" hash="26f7e631028c7ddb84127e8ac96c2f83"/><file name="haw_US.xml" hash="a9b06e7ecd3afce17721ab614f73e1c6"/><file name="he.xml" hash="bb1608e365c2deb3e2b0cc669716d6cc"/><file name="he_IL.xml" hash="63a9b1144f33ef18ef5818e4acab4f40"/><file name="hi.xml" hash="71166cd7cb11d27d8de09dcc614f4aec"/><file name="hi_IN.xml" hash="127fd26a331c5e6b1a77be00c3744e0d"/><file name="hr.xml" hash="46853e04f942c4ae0c2c1386eb457a5c"/><file name="hr_HR.xml" hash="709f70182017b221823205f17358b896"/><file name="hu.xml" hash="6633d5e7d07fc38d54d2831906d1b751"/><file name="hu_HU.xml" hash="1e619a9d91ec0ca3357ecd26c7a5ac52"/><file name="hy.xml" hash="7143eb4b52277e8e334201fefc9a62f7"/><file name="hy_AM.xml" hash="605006b51e75aafae134150888cdd1da"/><file name="hy_AM_REVISED.xml" hash="a8893ba87f2a776a8f24c1b5e10442e9"/><file name="ia.xml" hash="35b7c66addecae14bb27b47a65f84d9c"/><file name="id.xml" hash="5c67b57cff43376851702b343aeff1bc"/><file name="id_ID.xml" hash="b9f763fafe0b974e8e13b3156882a424"/><file name="ig.xml" hash="c9f308c4c308b368fc0a3b6c4cec24d5"/><file name="ig_NG.xml" hash="0838054b9af97c075bcf559832bea3c1"/><file name="ii.xml" hash="4d56b7f4bc9e25e35945261c26c9cf16"/><file name="ii_CN.xml" hash="2a237fe64250512ab37b277d8ed06536"/><file name="in.xml" hash="3044e542367661591059af4ae9efb1ec"/><file name="is.xml" hash="b50135fa67363485d3c0d9255a31fe3b"/><file name="is_IS.xml" hash="4be68f70c8860e5c191ab36fba0f4b23"/><file name="it.xml" hash="9f24c86aa41fbf0ab62a27b94a0e6ae8"/><file name="it_CH.xml" hash="f97d369e4e1caf9d652f6155db06b888"/><file name="it_IT.xml" hash="31db1a780448c8a4c2616cc0c2ee3b33"/><file name="iu.xml" hash="4ed6a2da93a84ec248c6271a0f7225b7"/><file name="iw.xml" hash="edf66433c47c515869d5b81973cc1ea2"/><file name="ja.xml" hash="35e0efe2d2c7ea66589d14cd5c336b9d"/><file name="ja_JP.xml" hash="399c1cdbd9236ffaa2c7883e3c61bb8c"/><file name="ka.xml" hash="3d7a83a59179bb0c773a7803af4e165d"/><file name="ka_GE.xml" hash="d6b81fa0d408c3dfe94bffaf92730c1b"/><file name="kaj.xml" hash="de0027d4bd6eb3857ff7ef425aa52149"/><file name="kaj_NG.xml" hash="8dc0276a54936ccc9bf5d0f036fbd9ac"/><file name="kam.xml" hash="ce685afb0e8e5639989f2e1b6ae3afbd"/><file name="kam_KE.xml" hash="b5e96ba69fd3021f1735744f92ca14c8"/><file name="kcg.xml" hash="cd6b50de9a79129abda886522e0ca9d2"/><file name="kcg_NG.xml" hash="744e856b4fd2526c2565d0da22ca76aa"/><file name="kfo.xml" hash="1ba6dff1874f610b2f4d5b5a89df30e6"/><file name="kfo_CI.xml" hash="666418b53d9f9e19a38f4b1755dbb4eb"/><file name="kk.xml" hash="b1e840877a8271202a4d210d3e654c12"/><file name="kk_Cyrl.xml" hash="df1254db7b57c5662e7c19c90ce89544"/><file name="kk_Cyrl_KZ.xml" hash="d68e6a1d0a938c4543bac524b4044fea"/><file name="kk_KZ.xml" hash="82d1f2bcb5810af5d8df2708f1ed1946"/><file name="kl.xml" hash="30c4add313bfcab4b9087bc0e84f7ec0"/><file name="kl_GL.xml" hash="a095a29dfc68c26b5773f367b1880925"/><file name="km.xml" hash="da6195f5728483435634c362988c4c34"/><file name="km_KH.xml" hash="ec4ee5208f595eaa9bf6057b32b3726a"/><file name="kn.xml" hash="e4bb04a204d2ae4af9fb6db4f058da39"/><file name="kn_IN.xml" hash="418fbdabc3a5e5b8a1ffd1a5cac30e62"/><file name="ko.xml" hash="c3894236bde348ebaf5a976f470e658a"/><file name="ko_KR.xml" hash="f5da1450c42c5176178d572cd652beb4"/><file name="kok.xml" hash="4d5c1bbded4cb8d3b6036851faf82a82"/><file name="kok_IN.xml" hash="3fd80a3c3375a9595d1b5e0c18677cc7"/><file name="kpe.xml" hash="923914e87c27a83616496f9343d87b93"/><file name="kpe_GN.xml" hash="f92163811f6c00edb98cda3cc690b914"/><file name="kpe_LR.xml" hash="db6b688c3fd445803056375f89903546"/><file name="ku.xml" hash="0f8844c3bf0e64d2bfa4f28e98cc0bb0"/><file name="ku_Arab.xml" hash="68397ddeaa9052510b42bdab09ffc501"/><file name="ku_Arab_IQ.xml" hash="4850ec014f1367cfb249d7b41b1cbc03"/><file name="ku_Arab_IR.xml" hash="409397f2403f8d344047e7da4d2b6084"/><file name="ku_Arab_SY.xml" hash="38103a93fa39d8758a4fcc221a63df91"/><file name="ku_IQ.xml" hash="37082aaeffa1a45a811a061e3c5a460b"/><file name="ku_IR.xml" hash="3fbfe6e8a0e1c325cb2d9752a9848661"/><file name="ku_Latn.xml" hash="a3d10f2f65e5dbb31faca5b65de72520"/><file name="ku_Latn_TR.xml" hash="fbf3aa44abecb0271170f51f34e6769c"/><file name="ku_SY.xml" hash="bdc1fa4cac8d10f0524e34e0b6828544"/><file name="ku_TR.xml" hash="d21471a7b604ddbb66a1f6dadd2c13cd"/><file name="kw.xml" hash="148d1b6e5720f6e8dc4c0590f283ddcb"/><file name="kw_GB.xml" hash="8883d4035af7ae36bd6546618e669491"/><file name="ky.xml" hash="1139f0f46ae2b5bca9669f951416f301"/><file name="ky_KG.xml" hash="0e081a68ec456629ebb7974fcadabe39"/><file name="likelySubtags.xml" hash="fac0ce67cd64fd52da65c5a1628480bd"/><file name="ln.xml" hash="66b326ca1b0452c09cca166f128f7a02"/><file name="ln_CD.xml" hash="2f51dd00bd21114680834f9232df0fc0"/><file name="ln_CG.xml" hash="a1e7d0c568921342243b608250cd32d5"/><file name="lo.xml" hash="54e686fe02aca37774e0950875ab6a2d"/><file name="lo_LA.xml" hash="bb33888f7aa3b8ef2fedf6eb692dfadc"/><file name="lt.xml" hash="c7bc14a86e05108e8e758a5217fadd9f"/><file name="lt_LT.xml" hash="3e9035751865f9e6be2e8335736da8ec"/><file name="lv.xml" hash="5dc4bf5ccbb1f9a7bc088a47baa95df1"/><file name="lv_LV.xml" hash="08b156de265b56b7f1018098322d3234"/><file name="metazoneInfo.xml" hash="bd3daee7860ad0f43bf20010e7bf2532"/><file name="mk.xml" hash="9d646f672391b8cded2f9e89bb4cb9bb"/><file name="mk_MK.xml" hash="a7544cac0dd5927ebab1def6ec06bb20"/><file name="ml.xml" hash="d40c5401a11ea7da49a0c4b6348ce70e"/><file name="ml_IN.xml" hash="e637fc70a096d4e827c9141b93763158"/><file name="mn.xml" hash="139a29d4ea1cd0e7e07ed494aa7553fc"/><file name="mn_CN.xml" hash="d832406defff2ae285fc55039fb8bf96"/><file name="mn_Cyrl.xml" hash="26ef820919f8a52e0dc56d27eff7d69e"/><file name="mn_Cyrl_MN.xml" hash="b9b06c0ab30a00bd6cd34c391909d1b5"/><file name="mn_MN.xml" hash="b98ece0df5be5f0de847a5ad2403036f"/><file name="mn_Mong.xml" hash="8b24025b1a2ad87189ae649826aab481"/><file name="mn_Mong_CN.xml" hash="3093369871fd3e0b64039b89e95988ad"/><file name="mo.xml" hash="a22058ee4fae9bd76a36ea068b4f3670"/><file name="mr.xml" hash="fb472e46b55620ee00470ee0d29cc789"/><file name="mr_IN.xml" hash="c6faa0acc05614f47d9cc179622b55fb"/><file name="ms.xml" hash="00fb6c412ec6253c7581d2ad4cdc4eb7"/><file name="ms_BN.xml" hash="9e31126d4805844a10e2c571c8cd539b"/><file name="ms_MY.xml" hash="f4c96fb6be925e69a51f8d9970e629f0"/><file name="mt.xml" hash="f71b3a7a61075e72d649a3416167c9ba"/><file name="mt_MT.xml" hash="54cb4e0759402234727dc31323d5ba05"/><file name="my.xml" hash="c9c85aae889328972cc3c4b0bcb282aa"/><file name="my_MM.xml" hash="6b8998d33f4ab505eb5531a21e4a487b"/><file name="nb.xml" hash="f6349c75f2e56299b88ac3509fb1dc14"/><file name="nb_NO.xml" hash="14a3a892b35d71b8ce34e6b09f83b1c8"/><file name="nds.xml" hash="28a2fc4b537e5332363bf34a4d4cb750"/><file name="nds_DE.xml" hash="64b9eab9cc1670a7e9eef9dc24a57bcf"/><file name="ne.xml" hash="9b8897070653bb3ad857c4dc2394a35d"/><file name="ne_IN.xml" hash="7cd76870bd8d7c155a57e1120cb276a4"/><file name="ne_NP.xml" hash="0d55143bd6ccc29f6aae464df2f32b49"/><file name="nl.xml" hash="32805cda6a6821665abb2f6be1447862"/><file name="nl_BE.xml" hash="e30997f6c81cc3a97522030f7b1f202f"/><file name="nl_NL.xml" hash="8efb80164d4712185437bc8f06d2ad6b"/><file name="nn.xml" hash="16a37e238ed08c2b0fa8b505d9a6ba01"/><file name="nn_NO.xml" hash="6fe7bb43b5170b2994bfc271bc771327"/><file name="no.xml" hash="f0d90670484dd23fe05772ac2e15382d"/><file name="nr.xml" hash="3403f308a2bc9110579d0d97c9380234"/><file name="nr_ZA.xml" hash="c8c2548dd7b885eb97e1e6d10c3c504b"/><file name="nso.xml" hash="3b490f40b11a82728c890e14d2fc8076"/><file name="nso_ZA.xml" hash="46daf03827c9166bf44905d30e8cf590"/><file name="numberingSystems.xml" hash="cbcd70a2b73f574768aac661e11e07ff"/><file name="ny.xml" hash="bdce1e96a4c913a8dffcb1b8dffb3bb5"/><file name="ny_MW.xml" hash="9238a627cf47a2d696656e221d4a597d"/><file name="oc.xml" hash="0b674c8e7698dd8cfa329df02c4844b2"/><file name="oc_FR.xml" hash="5ebcae8b7d7e8e36dec03313bb6e50c9"/><file name="om.xml" hash="95344cb4d6b7af362d1df2a3c6554c89"/><file name="om_ET.xml" hash="eb04cf6a653a227eaa9de0b86879b645"/><file name="om_KE.xml" hash="48d3be97b34ba403cefd873d4e602cb9"/><file name="or.xml" hash="61334ddf30f86a678aa482545d5df1bd"/><file name="or_IN.xml" hash="a97b69213ac3e3a95312e6850f6d24d3"/><file name="pa.xml" hash="0c432aa6d7cd3114688b4d707adab724"/><file name="pa_Arab.xml" hash="41fb0dc457f8e7c46859042f3395b05a"/><file name="pa_Arab_PK.xml" hash="c787fe1a50047bf897d1fa1e5189d8b2"/><file name="pa_Guru.xml" hash="4ad746f636c72c9282a6e7616dc11ea3"/><file name="pa_Guru_IN.xml" hash="1ef9b6466ad6f8d5dc3007ea05d8b4bb"/><file name="pa_IN.xml" hash="4ee7292760d5cb8184611f80060ec233"/><file name="pa_PK.xml" hash="1b0fb7d7d36c7fbd30b3832fcadce996"/><file name="pl.xml" hash="355e1b357734f86bc0cb93772501bf84"/><file name="pl_PL.xml" hash="ab5eacaf2e8a931b5077cccc7733bd15"/><file name="postalCodeData.xml" hash="806b746b20b46e6fe3e58a07826cbd78"/><file name="ps.xml" hash="0471f3ec844f2a9c10851f5a92bc3bdd"/><file name="ps_AF.xml" hash="551e994ad3b21f63542039e3a7c89a25"/><file name="pt.xml" hash="1128c2f991690cb9cc310900814761c1"/><file name="pt_BR.xml" hash="421c84df9e8526699a6f4e4776476373"/><file name="pt_PT.xml" hash="852298b69fe6b84c65c05381ba9547b8"/><file name="ro.xml" hash="3e6a80dd67c58c5621511fa3417dac3d"/><file name="ro_MD.xml" hash="5062f279e26279dbec002494fb9f32bc"/><file name="ro_RO.xml" hash="2ad582f23397390e814837e578f28f8e"/><file name="root.xml" hash="ca717a6648732f2e162aad0682e7092e"/><file name="ru.xml" hash="0b657b8cd0a662588ea9aa220ee98aa6"/><file name="ru_RU.xml" hash="36fc5891eda1571eaa94bc26381cc978"/><file name="ru_UA.xml" hash="367c0d4ee7e70f151fb2cc0c421449bb"/><file name="rw.xml" hash="c7ef5f731d1f7d662cdc177dd0a609dc"/><file name="rw_RW.xml" hash="51806aa2b4b2681cae915cf739633921"/><file name="sa.xml" hash="be586c8125cbe9123f2cd830ca86f0dc"/><file name="sa_IN.xml" hash="df23f5384cabfa85d444a49b21e45afb"/><file name="se.xml" hash="969b6817e026b9c4ded70b4c73884b7e"/><file name="se_FI.xml" hash="4d015c856e531496133e3fb84937509c"/><file name="se_NO.xml" hash="30ee2dd1b111ef7390f10c1e2ae70448"/><file name="sh.xml" hash="3b07f9dd1a14a1520043aa5f781d5dd9"/><file name="sh_BA.xml" hash="739cbaf3e06f79fa65c74dbee7907297"/><file name="sh_CS.xml" hash="c0fcce1abefb76173de2bee1b71817f7"/><file name="sh_YU.xml" hash="39d43f69a8b758204237a5d3ff3b0876"/><file name="si.xml" hash="faa87cca5e64f9562cf2b083789d0826"/><file name="si_LK.xml" hash="4769c07793d67691fec45736d2d6b650"/><file name="sid.xml" hash="1ece23efa9364c9a489042782cab44b5"/><file name="sid_ET.xml" hash="7045d63bb622020751c3450dd812ccf6"/><file name="sk.xml" hash="1ace3178bf61abb7484ee6a7e97388a7"/><file name="sk_SK.xml" hash="7727b974e48af19f375581fe83e41b82"/><file name="sl.xml" hash="8573c3f8eceeb8b86fbdcd348a4a62c3"/><file name="sl_SI.xml" hash="d55a7442a189cb110f069286a2455cf8"/><file name="so.xml" hash="adce222848539758911b62ca5213b37e"/><file name="so_DJ.xml" hash="7bde0781f8de10cd9010a2e9cc9199fb"/><file name="so_ET.xml" hash="04d6047d643db95c39351c35128b9fb8"/><file name="so_KE.xml" hash="971801ef94ed1f222638e522e7593241"/><file name="so_SO.xml" hash="b534d8cd3d150d9c3b88a527f17dcbeb"/><file name="sq.xml" hash="aecfa769bfa6c5ba971f5dfc75f544a2"/><file name="sq_AL.xml" hash="a00bbad0a13ba867bda770c7a79d7888"/><file name="sr.xml" hash="6653877f87be2b2addd93bc560257982"/><file name="sr_BA.xml" hash="991a0c4ca367a3a879832c265e1b8981"/><file name="sr_CS.xml" hash="c7bdd1db349343cd14d8cc683cc5da48"/><file name="sr_Cyrl.xml" hash="80d35388be550ee19921ac7601fe505e"/><file name="sr_Cyrl_BA.xml" hash="fa9905d9577bdbbfe6a13ed7ea213c6f"/><file name="sr_Cyrl_CS.xml" hash="675d81d273948b9df6ee777b02f23bf7"/><file name="sr_Cyrl_ME.xml" hash="8f767cbff21e189a2ae45727175c7f84"/><file name="sr_Cyrl_RS.xml" hash="851a8907e73596a7e4a88681b64cf369"/><file name="sr_Cyrl_YU.xml" hash="cfe643075d2e9356ebfef8500708eb7a"/><file name="sr_Latn.xml" hash="5aa60ce58d6355d04933eb8efa95695e"/><file name="sr_Latn_BA.xml" hash="850fccfa2cfa49b42964b95afc691e2f"/><file name="sr_Latn_CS.xml" hash="3ff0c17724a152f49d310cdf21a30df3"/><file name="sr_Latn_ME.xml" hash="54260fbe5385c198bdb5fbf5378dc9e4"/><file name="sr_Latn_RS.xml" hash="431e6fcca205fcb752b11c575a60879d"/><file name="sr_Latn_YU.xml" hash="1085f717af0d5148a917931ee165faa5"/><file name="sr_ME.xml" hash="73c8773bebd8961076bab4fb55624d6c"/><file name="sr_RS.xml" hash="ba2ded11cfa83e552a45650842457bb9"/><file name="sr_YU.xml" hash="a8f21beda24e4c8e84bafda8b2ed33fe"/><file name="ss.xml" hash="3b8f5d2d27a27e3de5d45e54e9218665"/><file name="ss_SZ.xml" hash="2ab21662e4e278c0b9a090a3ff32fbc9"/><file name="ss_ZA.xml" hash="bdb9d6fe023e13ed1b8898920b415b4e"/><file name="st.xml" hash="6faf732d9663877ec484e9893b598c2f"/><file name="st_LS.xml" hash="c936808f2e80e3410c90abec5abe5a92"/><file name="st_ZA.xml" hash="a14e2582230b3b15e57c285c26c37201"/><file name="supplementalData.xml" hash="ba5e4dcda0370cb08c620697b15c4f52"/><file name="sv.xml" hash="22422b5a2e4f22b376583960ed2ca965"/><file name="sv_FI.xml" hash="a1911a69f2d90890831f95acb5562e8d"/><file name="sv_SE.xml" hash="e34a9c48cf902c01b25483b68d4364c2"/><file name="sw.xml" hash="b729fa98e9fcbad05b19aec4ded4f998"/><file name="sw_KE.xml" hash="e14ace7e82f1ab733ad3d3dee3cba5a6"/><file name="sw_TZ.xml" hash="c6abdba818054d1c434a44bb487829e7"/><file name="syr.xml" hash="7d8b9ae8e41bf6947adf961d63acff44"/><file name="syr_SY.xml" hash="c63343631193cec005b4047146708387"/><file name="ta.xml" hash="6e8986ff0a300ffcb972830ccccf8889"/><file name="ta_IN.xml" hash="c00987b83904537537675299b982b2cd"/><file name="te.xml" hash="d9d0e4423b44598ec40e1a748224a7d4"/><file name="te_IN.xml" hash="8ef1585dafc229e681bb42fd57d48e04"/><file name="telephoneCodeData.xml" hash="a9b998f6934b9dfca134764268becff6"/><file name="tg.xml" hash="c72fafdfff23afa58009170be465afcb"/><file name="tg_Cyrl.xml" hash="d5824954ecd5bae9b059b0a845ccccd6"/><file name="tg_Cyrl_TJ.xml" hash="14ac56a3273984af24b4acd8214d071d"/><file name="tg_TJ.xml" hash="5364ad2e2f81c0d5d786a59f6a79d8c4"/><file name="th.xml" hash="3b81f9a1a7f101cc1ab09be2c19a6c49"/><file name="th_TH.xml" hash="f8d34e978fd78f6a9767ad2c48b15bec"/><file name="ti.xml" hash="d21f93c2adf0ee81772e0dd7da12c386"/><file name="ti_ER.xml" hash="c9c893caebe3ecbce1026f50eb061f17"/><file name="ti_ET.xml" hash="5d6b70e0f9331cbd6ff6edc74ddcffda"/><file name="tig.xml" hash="9ef043ae0df780fbbee137afe8f6726c"/><file name="tig_ER.xml" hash="2c21823465d5463de0888da50b9cc566"/><file name="tl.xml" hash="872c2ad9d0d3635be534273242ac15a7"/><file name="tn.xml" hash="8ee1706efa80e117fd39c1bed6587704"/><file name="tn_ZA.xml" hash="853f5e4edbb174b07e29328bfee4f3f3"/><file name="to.xml" hash="0fce387ec26a56bba11c7933dcdc08c3"/><file name="to_TO.xml" hash="67610188aa4198a4e606f56f27baef5c"/><file name="tr.xml" hash="f8a9adbda722ad7434f20a3b048d9dd9"/><file name="tr_TR.xml" hash="7546fd6e244448b490386a9cd611941f"/><file name="trv.xml" hash="fcd244e53b697e51fedd6315dc1420fd"/><file name="trv_TW.xml" hash="c1893c4837e1c81cb3ead9e5fbdba75d"/><file name="ts.xml" hash="5f2c23c03d5f7ab35590fd9f432e6698"/><file name="ts_ZA.xml" hash="ceefcc5eb546229e11ba2c62e8241e9c"/><file name="tt.xml" hash="77e2260880b98d26c25c3321414f8ddc"/><file name="tt_RU.xml" hash="74cf61b77a5f46e0ac97f27bad1af54e"/><file name="ug.xml" hash="22d5dc71ff232fe6e95e7217aa5ca446"/><file name="ug_Arab.xml" hash="fe3507b57203ad0be35de268f2a8d969"/><file name="ug_Arab_CN.xml" hash="db49dfa8fc3ba0cc10ad7c49ee8b456c"/><file name="ug_CN.xml" hash="26c5b70ae9f176f1c319bb391145cee3"/><file name="uk.xml" hash="84875a0c9d1f5fcdac47c349c1fc1f69"/><file name="uk_UA.xml" hash="671f3cd94e01d25b2b895166e68a0b1e"/><file name="ur.xml" hash="270638502c6395efc809d4509ea1f505"/><file name="ur_IN.xml" hash="9188136b5ec2bbdcf3f2547cb149655b"/><file name="ur_PK.xml" hash="152a658b6563a7ec8113b2ef3cd8c0dc"/><file name="uz.xml" hash="5e062cda92b711fe2b35a2c2336976eb"/><file name="uz_AF.xml" hash="8462c1b422924edf32f8776547a7b308"/><file name="uz_Arab.xml" hash="58aa174961749ec6863ce5915efea1b4"/><file name="uz_Arab_AF.xml" hash="ea05a4e85da0dace0cb1989f9998fc4e"/><file name="uz_Cyrl.xml" hash="af95819e1095d984514209d5955fb687"/><file name="uz_Cyrl_UZ.xml" hash="67e66fe187fdf2020124dc4f75b6bfaa"/><file name="uz_Latn.xml" hash="8a71f6499d5c85d03ecb497ae04db485"/><file name="uz_Latn_UZ.xml" hash="4d5279723b3b3fc819cbb14da170aace"/><file name="uz_UZ.xml" hash="5e748787719f86ef4469ef9fcb3f9a15"/><file name="ve.xml" hash="6af3b37a234d40bdda36b21cbf4e8922"/><file name="ve_ZA.xml" hash="ea6d866fa34e2d4d84bb6466c007dbd7"/><file name="vi.xml" hash="3f4c5e2650127c4102b195a25591c8b8"/><file name="vi_VN.xml" hash="3f6d9833dff5c42b99efb4eca564f0d5"/><file name="wal.xml" hash="2dd716a5b994569bdde3f8c647570e6f"/><file name="wal_ET.xml" hash="4d02f0151bc327396f27cf96ea5268f4"/><file name="wo.xml" hash="b4bb59df9d2e5528ffb0996ee37eb491"/><file name="wo_Latn.xml" hash="b937594c63b3c7980587457a1876eb5f"/><file name="wo_Latn_SN.xml" hash="90fd7ec9ab36ed31bbf094759339db5b"/><file name="wo_SN.xml" hash="ef1e5f77fed75a8ff72b7693a954ea42"/><file name="xh.xml" hash="8cd5441394d8cac9b0aa2ff232d5dc0e"/><file name="xh_ZA.xml" hash="05512b752c90460f618a5fd93edab65c"/><file name="yo.xml" hash="ce91b473ed489a17fae96b80a573476e"/><file name="yo_NG.xml" hash="8ab9fa6773563014d80e1e35e24a390c"/><file name="zh.xml" hash="3ab2f739773ff5435d5e67bde77a5898"/><file name="zh_CN.xml" hash="c65dbc187b2acc5219ba6e7c828bff25"/><file name="zh_HK.xml" hash="1dcfe3cec2637f40c54ae4c87fcc2a2c"/><file name="zh_Hans.xml" hash="fd245d056022b8e285077ab4d977e0e7"/><file name="zh_Hans_CN.xml" hash="f3724fb7225e8ed6a18660e7f38566bb"/><file name="zh_Hans_HK.xml" hash="0330f1c7af142199a0203afc42328472"/><file name="zh_Hans_MO.xml" hash="2177d503dcf6a5bec501e7a857f4e0f0"/><file name="zh_Hans_SG.xml" hash="87de0b02bbaa67e8a60a5b9dd9b4e1b3"/><file name="zh_Hant.xml" hash="882e343d411db70d5ca72f3e44f229b8"/><file name="zh_Hant_HK.xml" hash="5d65fb224c1518bb28654ffb20413ea2"/><file name="zh_Hant_MO.xml" hash="8048bc79d492a5eade131d7930743344"/><file name="zh_Hant_TW.xml" hash="026604ae13e4d4690281e8c2d3001182"/><file name="zh_MO.xml" hash="79fbfb562c2333333fae18401c4c683f"/><file name="zh_SG.xml" hash="e56d9124d60ac04575705c50e912e74c"/><file name="zh_TW.xml" hash="dc3ff77cf811c5d14c8d14f88505bf71"/><file name="zu.xml" hash="fa7adaf70205a86092dedd302dfd9de1"/><file name="zu_ZA.xml" hash="cd85bb1f3f51d0ec18fda39b34cfbe8d"/></dir><file name="Data.php" hash="594ba86ad93b8aec84f0ba53dd9872dc"/><file name="Exception.php" hash="fc6c18122f9bc67a1cf5235d50ba32af"/><file name="Format.php" hash="dffaec5eaba9d478141519e24d1bb677"/><dir name="Math"><file name="Exception.php" hash="4443ecd24bc7136345c001e1eac3ccba"/><file name="PhpMath.php" hash="6a2d7cfa0de91f9ff3d3ae609f898afc"/></dir><file name="Math.php" hash="70e1427fb163f7cad3144c3942693533"/></dir><file name="Locale.php" hash="71da882e2caf1cc6e80060402525ed0b"/></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
-</package>
diff --git a/var/package/Mage_Centinel-1.5.0.0.xml b/var/package/Mage_Centinel-1.5.0.0.xml
deleted file mode 100644
index 47d377bc32..0000000000
--- a/var/package/Mage_Centinel-1.5.0.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Mage_Centinel</name>
-    <version>1.5.0.0</version>
-    <stability>stable</stability>
-    <license>mixed</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>3D Secure Card Validation</summary>
-    <description>An integration with Cardinalcommerce Centinel service. Provides option to validate Visa and Mastercard cards for eliminating possible fraudlent order placement attempts. Adds information about Electronic Commerce Identifier, that designates liability for chargeback.</description>
-    <notes>1.5.0.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:01:22</time>
-    <contents><target name="magecore"><dir name="Mage"><dir name="Centinel"><dir name="Block"><dir name="Adminhtml"><dir name="Validation"><file name="Form.php" hash="70ab7d09934b3a9a362562ae3924e7f1"/></dir><file name="Validation.php" hash="1e2a34b8a3a81a0ced39f08335a8517e"/></dir><dir name="Authentication"><file name="Complete.php" hash="91f9ad0da12c8e40b0544961f9a8c8be"/><file name="Start.php" hash="569c799329616f1bff33ace927c11c65"/></dir><file name="Authentication.php" hash="977e053b3a2ae27657e9575ac6d58f8b"/><file name="Logo.php" hash="1912aa4ba565e824c5ec2112199ab2d4"/></dir><dir name="Helper"><file name="Data.php" hash="92dd33b7acd15b7cc4ca03049722b037"/></dir><dir name="Model"><file name="Api.php" hash="d6521215164a41f9c7a7c3a133b2804c"/><file name="Config.php" hash="60e96f86d5beb9fbb82830f3a68b0429"/><file name="Observer.php" hash="c583a1f855fc1cdcda383d08857f1dbc"/><file name="Service.php" hash="bde5d3aa48bb32e2827703249c74e203"/><file name="Session.php" hash="3013041107d54909bf074c5e50be3deb"/><dir name="State"><file name="Jcb.php" hash="5af83985a3370315c6cdc7ccbf9dbbd6"/><file name="Mastercard.php" hash="3c013feebe8fd576e529e79f818cf8fc"/><file name="Visa.php" hash="55468229039cd8ef58bc34c10d3c5768"/></dir><file name="StateAbstract.php" hash="18040e3e9c825e6ac971100417be2309"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Centinel"><file name="IndexController.php" hash="58b7a32a2182cf3da1a2ae1332603f08"/></dir></dir><file name="IndexController.php" hash="be00cfbe5ee0705acb40b75928130073"/></dir><dir name="etc"><file name="config.xml" hash="1394a6b3f8bc07a3f8a9cef5e3fa5e16"/><file name="system.xml" hash="a3191fdae7e4ce5d1231dde996c983ce"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_Centinel.xml" hash="ac72918e9f05fc2225e40a80b4bb3ef7"/></dir></target><target name="mageweb"><dir name="js"><dir name="mage"><dir name="adminhtml"><dir name="sales"><file name="centinel.js" hash="4d7f6812a05dd5ad1cd1940215020617"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="centinel"><dir name="authentication"><file name="complete.phtml" hash="84cd354a8f04cefb424aa094447b5ce6"/><file name="start.phtml" hash="d4838572b3e64d6882e9b71372d81c25"/></dir><dir name="validation"><file name="form.phtml" hash="ccec672ee213eedb37fdf997a145d13a"/></dir></dir></dir><dir name="layout"><file name="centinel.xml" hash="d0730f929259738165d75cae93701501"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="centinel"><dir name="authentication"><file name="complete.phtml" hash="d2ee1e38c6b70cfd4e12e60b105f1cc5"/><file name="start.phtml" hash="7aa9687d0124eb51e7a919737cadebb8"/></dir><file name="authentication.phtml" hash="d44f94727a9939f4428735e3c4aeb60d"/><file name="logo.phtml" hash="f5adc7ec556edac2c826727aa8db47d6"/></dir></dir><dir name="layout"><file name="centinel.xml" hash="8657138100228433451cf0b608a3b162"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Mage_Centinel.csv" hash="638d517f5f2f2e5801b07a45fab9130b"/></dir></target><target name="magelib"><dir name="3Dsecure"><file name="CentinelClient.php" hash="e8459bd7d542e38058529e9bbb27ca25"/><file name="CentinelErrors.php" hash="e99aa9e865cc56beb2cf99d616ff0ceb"/><file name="XMLParser.php" hash="d089f3a81ac81378c889eee73a52f413"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="centinel"><file name="sc_learn_62x34.gif" hash="059ec6c3eecea97b3f70a2e2d6ceb911"/><file name="v_activate_steps.gif" hash="005312b14c6aed41e8a47c4acaac7c1a"/><file name="vbv_ltbg_71x57.gif" hash="2b0bcd07251fcaafd46e7ce77ba821a9"/></dir></dir></dir></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.5.0.0</min><max>1.6.0.0</max></package></required></dependencies>
-</package>
diff --git a/var/package/Mage_Compiler-1.5.0.0.xml b/var/package/Mage_Compiler-1.5.0.0.xml
deleted file mode 100644
index bf0852aa55..0000000000
--- a/var/package/Mage_Compiler-1.5.0.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Mage_Compiler</name>
-    <version>1.5.0.0</version>
-    <stability>stable</stability>
-    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>This module compiles all files of a Magento installation and creates a single include path to increase performance</summary>
-    <description>This module compiles all files of a Magento installation and creates a single include path to increase performance</description>
-    <notes>1.5.0.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:01:23</time>
-    <contents><target name="magecore"><dir name="Mage"><dir name="Compiler"><dir name="Block"><file name="Process.php" hash="d8f745d9cc007343aeba8d311af91b8b"/></dir><dir name="Helper"><file name="Data.php" hash="766f6a07e05460a6f410b5214df99f20"/></dir><dir name="Model"><file name="Process.php" hash="b6d725942cd71b15fbbd5a450eaae260"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Compiler"><file name="ProcessController.php" hash="eac2e591ec661e48906a7ac946761a5f"/></dir></dir><file name="ProcessController.php" hash="44c0d89f2a35c7c2c969a6c8e6ce9a29"/></dir><dir name="etc"><file name="adminhtml.xml" hash="caa4e0f738889fd172c8231a7164b221"/><file name="compilation.xml" hash="ac882fb6cffaae5b94e9fc10e26263dd"/><file name="config.xml" hash="8143bf14661b3ea0a6d1899f09a7ad46"/></dir></dir></dir></target><target name="mage"><dir name="includes"><file name="config.php" hash="8400dea44d09cc57209d8a64cdd207d7"/><file name=".htaccess" hash="72617d60821288133a367f70bf39ad93"/><file name=".htaccess" hash="72617d60821288133a367f70bf39ad93"/></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_Compiler.xml" hash="04e28df1b9208c97ddadc8c365b75d95"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="compiler.xml" hash="a334a155bb1d38e57769e0f34571c461"/></dir><dir name="template"><dir name="compiler"><file name="process.phtml" hash="feca53a49af569e0a40547240ba18a4d"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Mage_Compiler.csv" hash="caa1d67e6c508421a8c8c234ae204c5d"/></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.5.0.0</min><max>1.6.0.0</max></package><package><name>Mage_Core_Adminhtml</name><channel>community</channel><min>1.5.0.0</min><max>1.6.0.0</max></package></required></dependencies>
-</package>
diff --git a/var/package/Mage_Core_Adminhtml-1.5.0.0.xml b/var/package/Mage_Core_Adminhtml-1.5.0.0.xml
deleted file mode 100644
index 9fc4828959..0000000000
--- a/var/package/Mage_Core_Adminhtml-1.5.0.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Mage_Core_Adminhtml</name>
-    <version>1.5.0.0</version>
-    <stability>stable</stability>
-    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Magento Administration Panel</summary>
-    <description>Magento Administration Panel</description>
-    <notes>1.5.0.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:01:23</time>
-    <contents><target name="magecore"><dir name="Mage"><dir name="Adminhtml"><dir name="Block"><file name="Abstract.php" hash="5795030e7231d6901fe8357544561bc7"/><dir name="Api"><file name="Buttons.php" hash="e8e6852985c10f31ac0a979696369c1c"/><file name="Editroles.php" hash="ca8ee461d25c4c1525d72a301f5071c8"/><file name="Edituser.php" hash="dac13da40089fe0836dfa7f5dd203475"/><dir name="Grid"><file name="Role.php" hash="7357623d240f2955ff5e06ca46fe0d05"/></dir><dir name="Role"><dir name="Grid"><file name="User.php" hash="ff02091f37882117aa3c085bc9f82154"/></dir></dir><file name="Role.php" hash="fd5e619a4789224e8a4d254261ffb22a"/><file name="Roles.php" hash="25609971ef5592be32cf3f4c723f8cd8"/><dir name="Tab"><file name="Roleinfo.php" hash="ad01f173215a78a0993b268f4c3d7300"/><file name="Rolesedit.php" hash="13ce46bc844a2480d2c73038b85c3db5"/><file name="Rolesusers.php" hash="df08f4a59b64dfb2cbd74e846d96eb2c"/><file name="Userroles.php" hash="2f7958da617911e27316274f41aaca7f"/></dir><dir name="User"><dir name="Edit"><file name="Form.php" hash="554ea8fb24129c12b98dc370081ce33b"/><dir name="Tab"><file name="Main.php" hash="c7f0564ed66b4dfd7915d17decb85b7e"/><file name="Roles.php" hash="4c23204edb7a9dd570f06e360f4186bf"/></dir><file name="Tabs.php" hash="3f3997db1f38a8442e2c40c453b8b462"/></dir><file name="Edit.php" hash="3bf7995db7751eaafaa8ffdaeb5953a7"/><file name="Grid.php" hash="1f1b87f8943731d317e9f27f6fbdd6e8"/></dir><file name="User.php" hash="65b694823608d155b3e40bb15a99ccd7"/><file name="Users.php" hash="8f411cf8c793cbf73cb5075c6db5afc9"/></dir><dir name="Backup"><file name="Grid.php" hash="2213745eb47b64477e44ca2b3c694c76"/></dir><file name="Backup.php" hash="2ae5d3cf07ab16e29bea8d8978d29799"/><dir name="Cache"><file name="Additional.php" hash="76582b337da706d677bd9b480e4ab8a6"/><file name="Grid.php" hash="0b271fffcf1cce1fe6b39923219c0a11"/><file name="Notifications.php" hash="6a8bbf400a1c9a2d34cc5e5c2e62f588"/></dir><file name="Cache.php" hash="2247fe843fd78ac8b7cfe0b567f398f9"/><dir name="Catalog"><dir name="Category"><file name="Abstract.php" hash="b9852f1b7d1dc54e1deb65bb7c30034a"/><dir name="Checkboxes"><file name="Tree.php" hash="dcccd8abfd668688b49689f32f8d1506"/></dir><dir name="Edit"><file name="Form.php" hash="8200897f512588bd053af41f62621d7c"/></dir><file name="Edit.php" hash="c8fe71a907f1e65e535ed11da3d1c82e"/><dir name="Helper"><file name="Image.php" hash="0e7052d07d22207537992f75fcab7c37"/><file name="Pricestep.php" hash="521395bd9016989946fb83adffdd2f78"/><dir name="Sortby"><file name="Available.php" hash="dab798f2e6e52ee9d6b1b62fab5e16b6"/><file name="Default.php" hash="347bb3c4ebb5bec1e889a35bca770b07"/></dir></dir><dir name="Tab"><file name="Attributes.php" hash="0078dd7c2e584f5aeb61ac278de060e7"/><file name="Design.php" hash="35d362524d54eb273adbb6c8f4a5ccaf"/><file name="General.php" hash="0dd4b71688fec5dd751a43ea95432d47"/><file name="Product.php" hash="dbce9aa99e0d352d607d7ece696b2836"/></dir><file name="Tabs.php" hash="c6a192e6a9c1f647be9b48ac956058f5"/><file name="Tree.php" hash="eba293370483153e1d7b4b38197a32c8"/><dir name="Widget"><file name="Chooser.php" hash="1f2eda8783bcacaedac739d23f637430"/></dir></dir><dir name="Form"><dir name="Renderer"><dir name="Attribute"><file name="Urlkey.php" hash="c0d75a6b8f285de2fe03105b77d3b7b9"/></dir><dir name="Config"><file name="DateFieldsOrder.php" hash="a6bf97c7477a44c563759215caffef16"/><file name="YearRange.php" hash="a9a542ebf9d7bb0f4b95323d20b65239"/></dir><dir name="Fieldset"><file name="Element.php" hash="5ddbb502aa1a4f8be7e650d4abc592a5"/></dir><dir name="Googleoptimizer"><file name="Import.php" hash="b392ca519247c39aa4d0db029d3f2b35"/></dir></dir></dir><file name="Form.php" hash="22a6b0a03de8b2962de12aa7161335eb"/><dir name="Helper"><dir name="Form"><dir name="Wysiwyg"><file name="Content.php" hash="9bdc0a7e8b1873adda3a5386f90aa510"/></dir><file name="Wysiwyg.php" hash="eeef9fbb4724123121a72e73da2afc89"/></dir></dir><dir name="Product"><dir name="Attribute"><dir name="Edit"><file name="Form.php" hash="d4c33f7ad3612ea41f95af04cc947c94"/><dir name="Tab"><file name="Front.php" hash="3e55b7ffeaab2662f8fc408a2f05d03f"/><file name="Main.php" hash="d4f35e97d985227d14506b24d1c869c6"/><file name="Options.php" hash="68f5b91ac73e5b8f6a5260cdfa2f120d"/><file name="System.php" hash="3f9a9270e08ffa3c2508425341cb91a9"/></dir><file name="Tabs.php" hash="0ec5b2dbaa2b2c657bf1a6b018ed9d3f"/></dir><file name="Edit.php" hash="3c1e50f92fdc846140f68c7d2ef88c10"/><file name="Grid.php" hash="3962f53394bbf62a49cf32a92a64c980"/><dir name="New"><dir name="Product"><file name="Attributes.php" hash="bef0e306953d0bbda2850d4bbed8c7b6"/><file name="Created.php" hash="00d29bef08073b7f24e7458ca2596a8a"/></dir></dir><dir name="Set"><file name="Grid.php" hash="73b3dc0c9c5b55b22f6811163bc9d312"/><dir name="Main"><file name="Formattribute.php" hash="a7f0bad2d0d8332fc6b2cd5585790997"/><file name="Formgroup.php" hash="34403a89217ddeb2a8b5e24119d3040d"/><file name="Formset.php" hash="4f614cc48507fb01d4199fc2cd997139"/><dir name="Tree"><file name="Attribute.php" hash="15e2de0315f14f3df9f55cf357e79d10"/><file name="Group.php" hash="c77aa136ee080dc6d3042b3f63d9a06c"/></dir></dir><file name="Main.php" hash="64188fd694dd3037bb93fdcc57f4f834"/><dir name="Toolbar"><file name="Add.php" hash="6b4a8b0e99e1cb54820741bbfcb8b077"/><dir name="Main"><file name="Filter.php" hash="f0352d4567c8c265ff28353bf7361a82"/></dir><file name="Main.php" hash="6fb5b6b8cdf058f0e4dc537fa4e50604"/></dir></dir></dir><file name="Attribute.php" hash="92702eabc427ebf4ef9981754f673726"/><dir name="Composite"><file name="Configure.php" hash="2e2d75a1560812b225c4f64815977e24"/><file name="Error.php" hash="4d5af83513b3f5dbc5091b6bee0bca5e"/><dir name="Fieldset"><file name="Configurable.php" hash="a27adde3c93a597d587f4c2c7dae2e90"/><file name="Customoptions.php" hash="78fba93a5c13bb678044bceab2d35590"/><file name="Grouped.php" hash="31f558481fe44a6bc580ee070d4eb932"/><file name="Options.php" hash="969bc04fde37460a936aec3cc21711d6"/><file name="Qty.php" hash="0aa13532c5ae68dce8ac3facc6a50a4c"/><file name="Simple.php" hash="7059f611481c5fb2e875ca7cbadcefbb"/><file name="Virtual.php" hash="94c21fc4bd81538ce2b7a826a7bed91b"/></dir><file name="Fieldset.php" hash="1e9f58174fb6416e239f057a3e197dbd"/><dir name="Update"><file name="Result.php" hash="7585b175f69d5febb84656a7a9cbf8cb"/></dir></dir><file name="Created.php" hash="02d6f93419cd399bbdd55faa033bcceb"/><dir name="Edit"><dir name="Action"><dir name="Attribute"><dir name="Tab"><file name="Attributes.php" hash="35f5869de49df93bcb170a6894844458"/><file name="Inventory.php" hash="aa191c589ee155f0ac21b2b5302ac45f"/><file name="Websites.php" hash="b0340ed16a440ca2bf2f494c0bfd311f"/></dir><file name="Tabs.php" hash="da63be56ce0d9c661546e74ec6db8e0e"/></dir><file name="Attribute.php" hash="d387d5c07c189bd2c1308feb11d8e30a"/></dir><file name="Js.php" hash="a5dd6dce9c3af6c9a8755885755fdc3d"/><dir name="Tab"><dir name="Ajax"><file name="Serializer.php" hash="ad61ce9930c3ba46df66af8f09b6d0fb"/></dir><dir name="Alerts"><file name="Price.php" hash="fcedb0307bbc098d61c24c6fd0713cd2"/><file name="Stock.php" hash="52edeca033420d789772e4bbe5f056bf"/></dir><file name="Alerts.php" hash="8c640512819052a06f20a55139d625fc"/><dir name="Attributes"><file name="Create.php" hash="f6310467a288362cbdba44f454c18629"/></dir><file name="Attributes.php" hash="8b312dc365052400c6b92fcb66a243da"/><file name="Categories.php" hash="3daf971e39324a233061a57b5bc0a74f"/><file name="Crosssell.php" hash="1879f1fdbe6c31b96094cd1e78f3791d"/><file name="Inventory.php" hash="175793176fcc53f11592f9a4434b31e6"/><dir name="Options"><file name="Option.php" hash="d340590403a6c967b2dbf1640d2f65f4"/><dir name="Type"><file name="Abstract.php" hash="108c52ec3ac75d3b9a28ae82bb13c887"/><file name="Date.php" hash="fd7dddfab51a7e8fa10ed53dc7db72ac"/><file name="File.php" hash="1a8c95bdd2804b14cf4929f155f6819e"/><file name="Select.php" hash="f27fc9de39bc65de6bd20aed632abb7b"/><file name="Text.php" hash="513b7e18756190ef6def65a3f3c8ed5a"/></dir></dir><file name="Options.php" hash="db29ce7c1ca33da8b24cf87d40268d63"/><dir name="Price"><file name="Recurring.php" hash="6a2abb834766f653191afba520797c7a"/><file name="Tier.php" hash="428665bf625972c75f2fefae23f5d371"/></dir><file name="Price.php" hash="1b4334a9cbd46cddfc106869495fa8ad"/><file name="Related.php" hash="81bf933bdf5b9562a8283a23381f74a5"/><file name="Reviews.php" hash="c9ede4fc0e17c6280e63dbcbccffed92"/><file name="Settings.php" hash="c419db496b0e21fa65f5dd08bd9ea2e8"/><dir name="Super"><dir name="Config"><dir name="Grid"><dir name="Filter"><file name="Inventory.php" hash="36f1af600bed3a4e30152a8b29d39fa7"/></dir><dir name="Renderer"><file name="Checkbox.php" hash="07ccb560c9cef80b1177fdb9288fca76"/><file name="Inventory.php" hash="704063f17c64623f0790723f0114c848"/></dir></dir><file name="Grid.php" hash="2126ef0d2d13ecc25060f33398cd8a19"/><file name="Simple.php" hash="5ba4786994fd1772117e7bbf7a931dce"/></dir><file name="Config.php" hash="cc195c93aa48492a66da634f58b1316f"/><file name="Group.php" hash="d6750e64986f1ddc8cb4981705e8fdf2"/><file name="Settings.php" hash="921c700b64f569e00bd0435612a0a4f6"/></dir><dir name="Tag"><file name="Customer.php" hash="e9013f42b9110f90daf7887aed23916c"/></dir><file name="Tag.php" hash="efc8e2ffdb1a7ce9bea4928f3dc857e2"/><file name="Upsell.php" hash="4ac53c6c5aeda5e53ba6eec00a1204a6"/><file name="Websites.php" hash="441b19857947f84f4cae277276516e3f"/></dir><dir name="Tabs"><file name="Configurable.php" hash="24ece67d83e4825c72012d55f3778e32"/><file name="Grouped.php" hash="9dfba474108c6b4532676285fb639a39"/></dir><file name="Tabs.php" hash="e6a2e8d27f03f97cf27214be83d78b1c"/></dir><file name="Edit.php" hash="15da556968fbba4e8e3c8b13e4055d95"/><dir name="Frontend"><dir name="Product"><file name="Watermark.php" hash="fa9945beff22a958b9aa27e2339f7d3d"/></dir></dir><file name="Grid.php" hash="62ba223b49001bd1325cb1c0d6665504"/><dir name="Helper"><dir name="Form"><file name="Apply.php" hash="e197bccb4404b4ee20d39251fa1102ab"/><file name="Boolean.php" hash="e125f2b8ae8e4218e4f59de52a0e5025"/><file name="Config.php" hash="27071560f59ede18772ed9588f1b5557"/><dir name="Gallery"><file name="Content.php" hash="70bdad34aefc78bcc3429e0e4eff4711"/></dir><file name="Gallery.php" hash="372018b9a6e61ceaf0c9328a6a4bce17"/><file name="Image.php" hash="08fe3df280bad638efbc2cf8434bfc07"/><file name="Price.php" hash="debad6677f0237aed146d14dfd5e0f54"/></dir></dir><file name="Price.php" hash="14b8869cdaaf598ce43f9d1ce15ecb80"/><dir name="Widget"><dir name="Chooser"><file name="Container.php" hash="5f6ad1a4d6825737c8979d02dd3fe620"/></dir><file name="Chooser.php" hash="db70dd155ac7334849cd4a7a704e0ef4"/></dir></dir><file name="Product.php" hash="f2ab800d9066dff0adf6c2d620bd44a2"/><dir name="Search"><dir name="Edit"><file name="Form.php" hash="b7a29cb35ed3c5c91af30b95d7fc8a94"/></dir><file name="Edit.php" hash="30d1343f29ca07a1314c492fc2a1dd24"/><file name="Grid.php" hash="1c3df4d66d40041b2588364f4ed4ec36"/></dir><file name="Search.php" hash="469cd61a43dc18603a2f332403bb1a04"/></dir><file name="Catalog.php" hash="6120bd3be65d5164f6b8c72ca6dbe3b9"/><dir name="Checkout"><dir name="Agreement"><dir name="Edit"><file name="Form.php" hash="1518237da25cd1acb0f74ded55ed4bc9"/></dir><file name="Edit.php" hash="43d5c0208e77f03950fb30672ada1d13"/><file name="Grid.php" hash="e567b8873a0c0d65f1172a5d46d3a9f3"/></dir><file name="Agreement.php" hash="909a31a0aa5736a7e14481311d52eae9"/></dir><dir name="Cms"><dir name="Block"><dir name="Edit"><file name="Form.php" hash="8cf3c159b0a79d3a3ae1a0d29b734ee8"/></dir><file name="Edit.php" hash="f6ec818a7ddf5b393a64295024394dcf"/><file name="Grid.php" hash="6d4e9ceda9ca64452f8cb40c7f9f015d"/><dir name="Widget"><file name="Chooser.php" hash="ba322d6e5d58d9a4f75561832b42c399"/></dir></dir><file name="Block.php" hash="039d2a6b8fcc8b47139823d518b2e04c"/><dir name="Page"><dir name="Edit"><file name="Form.php" hash="6dcc238b89d41ad46b8e2a0e4e2a1322"/><dir name="Tab"><file name="Content.php" hash="58c579068754f8ed2c44a6b590d5f67a"/><file name="Design.php" hash="f4827094e39880ac0091e1ebbcf36e4d"/><file name="Main.php" hash="4de90d20b0d4c1b158f8b8570b83c747"/><file name="Meta.php" hash="b223205eea90510ea1dd928cda023cb8"/></dir><file name="Tabs.php" hash="b92e3d9a204edc50026e85a01036f623"/></dir><file name="Edit.php" hash="e3d3bf08eec303baf669022fafc5b071"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="dfd8a24e9ed4dab28188eb21196e7920"/></dir></dir><file name="Grid.php" hash="0f05917e72bfe56c15c0bc2f4f2bdbe6"/><dir name="Widget"><file name="Chooser.php" hash="5c27016980118bf96558cb3ea52c9595"/></dir></dir><file name="Page.php" hash="6e542fd01162c9499ac2f22f6efcb75f"/><dir name="Wysiwyg"><dir name="Images"><dir name="Content"><file name="Files.php" hash="a0bc5a5722ef1ed5f73729c5a36829dc"/><file name="Newfolder.php" hash="a4b598deebbcebb0b9b515ac14c5faa9"/><file name="Uploader.php" hash="4b56dcb37abdd944222a76822f7189f0"/></dir><file name="Content.php" hash="909f36932332b266e3f05aded700f8a0"/><file name="Tree.php" hash="f853445ec6e014e8bc79f2297a24e0a5"/></dir></dir></dir><dir name="Customer"><dir name="Edit"><file name="Form.php" hash="767221438ea6259be9357e42ffcae2c2"/><dir name="Renderer"><file name="Newpass.php" hash="1a8ab62c83b32d6bb75a8c5ef4f8cfd2"/><file name="Region.php" hash="601a96f1fdb0ab278e6d4a3b45c60c18"/></dir><dir name="Tab"><file name="Account.php" hash="78faa5848dcef2ff1f69497603adadd7"/><file name="Addresses.php" hash="a3efe933560937e4f1be234ac66385f6"/><file name="Cart.php" hash="494bb2c32ab8b2b213e720a613f9c1a2"/><file name="Carts.php" hash="e5100dced7e0fee63f1d0065b18e52c6"/><dir name="Newsletter"><dir name="Grid"><dir name="Filter"><file name="Status.php" hash="20770c8b7854457b8fe9fc1f1ec93a68"/></dir><dir name="Renderer"><file name="Action.php" hash="3d3c5dd62810e29c1a72de562b1e0968"/><file name="Status.php" hash="a20377e2f45a5483e985947e004aa16c"/></dir></dir><file name="Grid.php" hash="579b3caac8bf8b9d5f2adae0a0ea0438"/></dir><file name="Newsletter.php" hash="f5c0759bc1c951038ac35940810d9ad7"/><file name="Orders.php" hash="801c085a805857824cfc33bd9eb9a76b"/><file name="Reviews.php" hash="b1b859c35e48ae070d13187a1511215e"/><file name="Tag.php" hash="e58142c6fe3497c0af7c65a29f38dd11"/><file name="Tags.php" hash="cd5910f3530dafe1c132951350d88bb3"/><dir name="View"><file name="Accordion.php" hash="fbf5abe8496e91c71a3d0a9ea0d6c35c"/><file name="Cart.php" hash="92398968a8fcbfdeae75321ec6360994"/><dir name="Grid"><dir name="Renderer"><file name="Item.php" hash="433af2fb7d87195588d7777352b04678"/></dir></dir><file name="Orders.php" hash="7d6b4e766bc9c47cf02e9e795048cc0e"/><file name="Sales.php" hash="cd8c7c7fe48c82fe905637dfbeaa041c"/><file name="Wishlist.php" hash="31679f9b016fea05ca749cd78e5d18a7"/></dir><file name="View.php" hash="1aeb3955cee0e3fcfd1c13ed7b55e9f5"/><dir name="Wishlist"><dir name="Grid"><dir name="Renderer"><file name="Description.php" hash="9b4b12df0671451a179d5be4b1176efc"/></dir></dir></dir><file name="Wishlist.php" hash="ca2031de13bde7b28a5361754b5a96c0"/></dir><file name="Tabs.php" hash="d2400954966a1da2e56cc36fb390ee90"/></dir><file name="Edit.php" hash="71ef00f5db0a4e0602c551b97630cafe"/><dir name="Form"><dir name="Element"><file name="Boolean.php" hash="8c8a9049519a78182f99ebc36e55d5f6"/><file name="File.php" hash="5f7421362bc459e6bf0ce146f41215df"/><file name="Image.php" hash="ef16419d355fd7d22f36e882f8b1ad62"/></dir></dir><dir name="Grid"><dir name="Filter"><file name="Country.php" hash="77777b4072874f6a5b0a01cf1e633b15"/></dir><dir name="Renderer"><file name="Multiaction.php" hash="91aaa907a46dc262c83ee2849587da6e"/></dir></dir><file name="Grid.php" hash="a032e8af043de635705161436d0d0765"/><dir name="Group"><dir name="Edit"><file name="Form.php" hash="0904af20cf2f4938c9ff872ed65b03fe"/></dir><file name="Edit.php" hash="8ed4b4ddf045cffc3f700a62a43e98f4"/><file name="Grid.php" hash="0ab92ff8f43efb1282c5d51124d54f66"/></dir><file name="Group.php" hash="f18fc529082567b2be82d857880cc355"/><dir name="Online"><file name="Filter.php" hash="a0dfaab8654013edd751dfb450c9d0a0"/><dir name="Grid"><dir name="Renderer"><file name="Ip.php" hash="86d2780e8e4e84948f2d2f298166ee07"/><file name="Type.php" hash="b83772bdf923afe2ac9f527a68c1be80"/><file name="Url.php" hash="9225538f38fde3af0d09ecfce549c284"/></dir></dir><file name="Grid.php" hash="eb5268b0d2d5c905a98b6803b6263f5c"/></dir><file name="Online.php" hash="7626d5f1dff488ab05f22441896c0db9"/></dir><file name="Customer.php" hash="1d5e95ab93e91fed180adfbcd2f38ce7"/><dir name="Dashboard"><file name="Abstract.php" hash="1ff6505fd54326ba024050b342a16438"/><file name="Bar.php" hash="0fb32f5f61a340e56c5771f59e10ade2"/><file name="Diagrams.php" hash="5d59f9026ea63f5d9dd04c8caa2bf681"/><file name="Graph.php" hash="8fc5619147a9b8271d855e14c485d28b"/><file name="Grid.php" hash="9e9c470e3888201fdde9a7db1684ecb1"/><file name="Grids.php" hash="0e36ae172cb1f106721c7cdfcda1ea31"/><dir name="Orders"><file name="Grid.php" hash="1cb7c2c2fa24e3c70134d6ea308621c9"/></dir><file name="Sales.php" hash="041c0d1fea90cd86ddfc7f41133ee4a9"/><dir name="Searches"><file name="Last.php" hash="1df95f38590278a2c4b3efa7873bd436"/><dir name="Renderer"><file name="Searchquery.php" hash="948bdbfa452dc3fc7c09c2dad20dcb08"/></dir><file name="Top.php" hash="53e7976c82656ca93fdbd34afb626ba9"/></dir><dir name="Tab"><file name="Amounts.php" hash="32c23c7aa4c776721bd4a5ed7e9340a2"/><dir name="Customers"><file name="Most.php" hash="4e144246c4f38b04d1da4cdf7b81b3c1"/><file name="Newest.php" hash="e6795a7fb1a89f4c143b7a768507d492"/></dir><file name="Orders.php" hash="8f93c5cc223cf256f82d40c6261c9858"/><dir name="Products"><file name="Ordered.php" hash="3b72679819ef0856e16e96af54ae95fa"/><file name="Viewed.php" hash="b3ce8d034f46fedf514bc89bc48e77e9"/></dir></dir><file name="Totals.php" hash="40e04d52570fce8ae4b1a3dcf631e195"/></dir><file name="Dashboard.php" hash="d8249fcdc367d1788e67b2a33d2b9c12"/><file name="Denied.php" hash="1f19915d764fc9754e0134c1bded1f6e"/><dir name="Html"><file name="Date.php" hash="cbd930fbc72ef9de2b0fb82eec095440"/><file name="Select.php" hash="68ccdf530cdb501811a9de4bdb2daf80"/></dir><dir name="Media"><file name="Editor.php" hash="84a5ec426d8486d8c82804d7b1848a7c"/><file name="Uploader.php" hash="57b6437c957fc3550293988416e41c78"/></dir><file name="Messages.php" hash="a1d474c7e4223e2dd007ae36a8e53356"/><dir name="Newsletter"><dir name="Problem"><dir name="Grid"><dir name="Filter"><file name="Checkbox.php" hash="648f94943f8ab4b9c7423ec7c0f4f2e1"/></dir><dir name="Renderer"><file name="Checkbox.php" hash="5f562458d779acce1ae0623a6b506788"/></dir></dir><file name="Grid.php" hash="e17b9503e6f0930fee676f548a8f1646"/></dir><file name="Problem.php" hash="79f405ecc89c93dd841244051d08d07f"/><dir name="Queue"><dir name="Edit"><file name="Form.php" hash="fd5ca67874369e74c0b2a824fbbb159e"/></dir><file name="Edit.php" hash="5d15b4fb9aeaadeae2a7a10b8568f09f"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="f8b5af7d6e1040be79833d4db416f0af"/></dir></dir><file name="Grid.php" hash="d07c683a7a2b52ae774519be97c32462"/><dir name="Preview"><file name="Form.php" hash="6ceae128c52705559b6201979fcef360"/></dir><file name="Preview.php" hash="43e55685e2e872c1be49cf3c35620aa3"/></dir><file name="Queue.php" hash="c499158aae43fddceea2b7504dd7e20a"/><dir name="Subscriber"><dir name="Grid"><dir name="Filter"><file name="Checkbox.php" hash="fa1d46b367cca98cb6351179741c6b68"/><file name="Website.php" hash="f74774f4959c896055fdbc71b657f538"/></dir><dir name="Renderer"><file name="Checkbox.php" hash="3642a0bbba74d3b39982a74598e5d8c0"/></dir></dir><file name="Grid.php" hash="3c68321477ff8eebf536723bba2d7638"/></dir><file name="Subscriber.php" hash="072e43c020f571f95c960919db5ef058"/><dir name="Template"><dir name="Edit"><file name="Form.php" hash="351b238df3a02ad1c2ba999c5c9e99cf"/></dir><file name="Edit.php" hash="2c43c881ad0c4d18f332403f87a07aa8"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="362f3e2349e0a249d28cdcb2bf672842"/><file name="Sender.php" hash="bacd34c3db501087257df713acda225b"/></dir></dir><file name="Grid.php" hash="c62cf82f093e28251f021b9173c9fb67"/><dir name="Preview"><file name="Form.php" hash="54feb506e24893d8d51171ddaa103ec0"/></dir><file name="Preview.php" hash="f129718f386a88cc36106f7f10832503"/></dir><file name="Template.php" hash="2cdaaa936b4c4ceaff29f639dcdc6c7b"/></dir><dir name="Notification"><file name="Baseurl.php" hash="a22185cea28a328381e265efa0a17628"/><dir name="Grid"><dir name="Renderer"><file name="Actions.php" hash="4fef6a2a9d6bfacea121346de2deae69"/><file name="Notice.php" hash="36417ef6fca7f66caabe16349720fed2"/><file name="Severity.php" hash="26550a8d9236bf0da1314195a63039b2"/></dir></dir><file name="Grid.php" hash="29c75c69587b14c770f5e6da7f8e7f4a"/><file name="Inbox.php" hash="7c6b9b3dd2c0839bf548d6dd684604e9"/><file name="Security.php" hash="8c7902d2dc9829478c993b2fd026a084"/><file name="Survey.php" hash="9a7fed90a2cccc9d09e53c46b9a6d9ea"/><file name="Toolbar.php" hash="c72af407cd38371688921a0e055fc89a"/><file name="Window.php" hash="caf07764e22d8942d953120f649cdde9"/></dir><dir name="Page"><file name="Footer.php" hash="2083094bd0ef05366202bab1a6596e87"/><file name="Head.php" hash="8a75cbcc6b94a859e8a17e0e48fe05ea"/><file name="Header.php" hash="5213a3d5b0d4e4b32bf76d88d0500f26"/><file name="Menu.php" hash="9a9575e36a96295835f5b6ec90dc02e3"/><file name="Notices.php" hash="6596ede6c9b7f18a4f1bfbdf2aeb4c8f"/></dir><file name="Page.php" hash="4763e3fc81c16e1bfa836261b06ad8d0"/><dir name="Permissions"><file name="Buttons.php" hash="aac3a2a0d8fbbe7fab90c8b6df067fba"/><file name="Editroles.php" hash="75e1ac22fffb60e425d9ca8656a9d63a"/><file name="Edituser.php" hash="7dc04ec7c3e715cdb2dfa1e38b41a123"/><dir name="Grid"><file name="Role.php" hash="a551d547ab72c2e88a7e178423d7acc8"/><file name="User.php" hash="5f6c39243f48f2344850ed9f165bcdcb"/></dir><dir name="Role"><dir name="Grid"><file name="User.php" hash="96a84a0779a5a662280294a08ab2c7c8"/></dir></dir><file name="Role.php" hash="a741ef00f5cfda3e469b854c4a518f3f"/><file name="Roles.php" hash="35d0cc0687911c5f8e93dcc8a6fd8e91"/><dir name="Tab"><file name="Roleinfo.php" hash="e5589ac68e99289fc4ad4d550d1caa65"/><file name="Rolesedit.php" hash="38b4a8569082cf66ae1f3ca8744aece6"/><file name="Rolesusers.php" hash="73606f8c336c6850bdea4b5d9788e13b"/><file name="Useredit.php" hash="0261ff6b774ab1386f0a826df7f5fd5d"/><file name="Userroles.php" hash="b1f47d2dfa579dccd1bb4e31c464b9f5"/></dir><dir name="User"><dir name="Edit"><file name="Form.php" hash="73f58003e4065b042405edcc89364454"/><dir name="Tab"><file name="Main.php" hash="6c731412cbd19b2084854e8798473645"/><file name="Roles.php" hash="ebbf213544196622dcec9938dc7e4120"/></dir><file name="Tabs.php" hash="cc04db9819e870a3735ecafc40556174"/></dir><file name="Edit.php" hash="70db79558321942bdc602128101ecee4"/><file name="Grid.php" hash="d48d447df3c5e050e3e599b57dd57876"/></dir><file name="User.php" hash="32a3486a4f6979ec0740de2706ef90ac"/><file name="Usernroles.php" hash="456bfbe12d13638143e02a3842e71e83"/><file name="Users.php" hash="ca21654c4e5b44a2b8b92c0e15780871"/></dir><dir name="Poll"><dir name="Answer"><dir name="Edit"><file name="Form.php" hash="24db218b978069e64f7c5cae7eab642c"/></dir><file name="Edit.php" hash="a74c705900a136ee2280c5c6346bd485"/></dir><dir name="Edit"><file name="Form.php" hash="fbd79497a5d50a338e2489cec08ac524"/><dir name="Tab"><dir name="Answers"><file name="Form.php" hash="138cb37ecde88428e7d589fc0053767d"/><file name="Grid.php" hash="82b14d782060d37213e5b7d3e8b51fcc"/><file name="List.php" hash="6aded59ff7905e7d6020f235e9710773"/></dir><file name="Answers.php" hash="41bd5459ac5774b9c6fc467d3ebdb801"/><file name="Form.php" hash="607b0abf233320f2ec677b71f042bf4e"/></dir><file name="Tabs.php" hash="5d8717381c27604609387edb34c7a47f"/></dir><file name="Edit.php" hash="592401e9fbfd2b120d759e392655234c"/><file name="Grid.php" hash="8a17347c79218dae32d2b73b9ae2feac"/><file name="Poll.php" hash="7598f78461a645f1581fbc7af21b2d8b"/></dir><dir name="Promo"><dir name="Catalog"><dir name="Edit"><file name="Form.php" hash="c008ea7c10bb3b2bee775b1fc22ceac9"/><dir name="Tab"><file name="Actions.php" hash="02104dbc00a52b6d67a29f0e4df5ab78"/><file name="Conditions.php" hash="47a77914201f2b8d4bd8e5ef9190d02a"/><file name="Main.php" hash="cf9f244ae87cb63e7a5781e53833c9bf"/></dir><file name="Tabs.php" hash="be02a4715dc74b78cf4c1660d412adb9"/></dir><file name="Edit.php" hash="d06f8bdd5f5861a9af3e75d43d9d5790"/><file name="Grid.php" hash="e81e0746d575db4f8c0b082018fb1ad3"/></dir><file name="Catalog.php" hash="6fb1aad0f9b6f57ff54f6ff10b5c1455"/><dir name="Quote"><dir name="Edit"><file name="Form.php" hash="d7b5dad1f54ed41654ad8d4fe9ae4bf8"/><dir name="Tab"><file name="Actions.php" hash="33eb451462f0d3e377088fc2b5f24aa2"/><file name="Conditions.php" hash="03b9e56d3736c1f72ce6444265b379e5"/><file name="Labels.php" hash="a4c20b1323640b5e41bda6203e7c1c67"/><file name="Main.php" hash="075a09a13fca37ba37c972483c491d29"/></dir><file name="Tabs.php" hash="d29a7b29139df98c8e19de8651157254"/></dir><file name="Edit.php" hash="8e7b09cdc8c66cbcbf7e51d54ff2068e"/><file name="Grid.php" hash="093acc6730d74a7b3e38472d1e54dcf3"/></dir><file name="Quote.php" hash="d5604b7e35487269350a3399bd7628c3"/><dir name="Widget"><dir name="Chooser"><file name="Daterange.php" hash="be223fc16582675b438017fa3b30c19f"/><file name="Sku.php" hash="562605343fbc279fd5e79182f664e366"/></dir><file name="Chooser.php" hash="79c44a4a793500e8af54712bffbfa608"/></dir></dir><dir name="Rating"><dir name="Edit"><file name="Form.php" hash="9ac6902e01cd828bef89fea256c4ed51"/><dir name="Tab"><file name="Form.php" hash="a9bd2f2d4a0b88cca4128bfaeb3f0130"/><file name="Options.php" hash="c1e48daf4397b0809e9cb08888158cc3"/></dir><file name="Tabs.php" hash="3bf4733eb9125b276614e73eca81731a"/></dir><file name="Edit.php" hash="933682bf2bfd748fbefb6937011f6d53"/><file name="Grid.php" hash="f30572dd9a242e31c5977b4cb3e88adf"/><file name="Rating.php" hash="4b5c7815594bd07df3485ccc2bafd7d6"/></dir><dir name="Report"><dir name="Config"><dir name="Form"><dir name="Field"><file name="MtdStart.php" hash="ab44f2291d27aad2a6bea3dc8359bfe6"/><file name="YtdStart.php" hash="5e1974250e08e6cf82fb5dbf5a8f5512"/></dir></dir></dir><dir name="Customer"><dir name="Accounts"><file name="Grid.php" hash="e8fb77f06cd1d5e8eb44678a5b819dc7"/></dir><file name="Accounts.php" hash="a34ef7ddd38a2c06bc8b32fe000b419f"/><dir name="Orders"><file name="Grid.php" hash="2a56b331226adda85b509482a8532a84"/></dir><file name="Orders.php" hash="f561aef64a8c51575c80ef38f063f8b6"/><dir name="Totals"><file name="Grid.php" hash="9ebebafbcb02978642fbfd5453125b81"/></dir><file name="Totals.php" hash="e1e3251a3427e414541cb87ce9351a21"/></dir><dir name="Filter"><file name="Form.php" hash="2f1c53aed096606c046951e161d88949"/></dir><dir name="Grid"><file name="Abstract.php" hash="0af28345c87ae0a51d560d9b2c2bbd95"/><dir name="Column"><dir name="Renderer"><file name="Blanknumber.php" hash="2dc3ebccac58fd10a42ffcad22450ac7"/><file name="Currency.php" hash="c2ce32223a6bacfe79681b900a432bc2"/><file name="Customer.php" hash="9df8f8709e45476b2608563bbc6e9e39"/><file name="Product.php" hash="e1b7affe04a132046eb932c6c8aa562b"/></dir></dir></dir><file name="Grid.php" hash="5172e87abb78d47d67fa2b3fec4d4878"/><dir name="Product"><dir name="Downloads"><file name="Grid.php" hash="175b892f3f1ef2e5bc7193800648826a"/><dir name="Renderer"><file name="Purchases.php" hash="fea9b7f6c6c5038dbc9083f8e5a39b4c"/></dir></dir><file name="Downloads.php" hash="9334f9f4f6ccd382ea7e242cc3138b19"/><file name="Grid.php" hash="6a526e21b2d0861af9d54d55ed0077ae"/><dir name="Lowstock"><file name="Grid.php" hash="3018f45d45235e6a01a9f45192ae0d74"/></dir><file name="Lowstock.php" hash="042eda6b1b4af484260104512438c808"/><dir name="Ordered"><file name="Grid.php" hash="39c6bdefbfbd22cfa33202a36e1f2daa"/></dir><file name="Ordered.php" hash="40c3deee5e6f4e875dc87e0c2e7ff9e7"/><dir name="Sold"><file name="Grid.php" hash="8f74b261ae131c136a900edd8cb1c775"/></dir><file name="Sold.php" hash="911de20351067f383d3bcfd2ffaf8ff4"/><dir name="Viewed"><file name="Grid.php" hash="fe3aa46f79e133b6d5f9a29132b19102"/></dir><file name="Viewed.php" hash="112fa2816f8b32ac3158be20956cde59"/></dir><file name="Product.php" hash="b3b7ec7966f5a6673f40dba69d50717b"/><dir name="Refresh"><dir name="Statistics"><file name="Grid.php" hash="5cea4b8d5c5e883d604a1fb6412017c9"/></dir><file name="Statistics.php" hash="0f301e08c618850533697faf9b8c68a2"/></dir><dir name="Review"><dir name="Customer"><file name="Grid.php" hash="4e3d92e703d7e6c3adfbd13f6ec47bd1"/></dir><file name="Customer.php" hash="6350cd912ee504cd397a5ade0fbdbd00"/><dir name="Detail"><file name="Grid.php" hash="04c71b3e9424b43678ddd29f5b42330d"/></dir><file name="Detail.php" hash="e9c0e4f9dcb6f8103be992aa898f6e06"/><dir name="Product"><file name="Grid.php" hash="0a7d2043d211a5a8c10723ef560290f3"/></dir><file name="Product.php" hash="2a3516ceb4751c4ffbb208e48d252b44"/></dir><dir name="Sales"><dir name="Bestsellers"><file name="Grid.php" hash="c6ddb8d2d7d29d60d125acdc60115d3c"/></dir><file name="Bestsellers.php" hash="e2dd1a0c6d7b33641691726b5fb86ec4"/><dir name="Coupons"><file name="Grid.php" hash="611e70b74688f32a5689adf5616cf0e3"/></dir><file name="Coupons.php" hash="8b13c9fd8df41c218f9f4cebefddd9ef"/><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Date.php" hash="9f2dc1632552d1b3223c07ab540837d9"/></dir></dir></dir><dir name="Invoiced"><file name="Grid.php" hash="d64e50f9ae3c37690301cc6bedb3a9af"/></dir><file name="Invoiced.php" hash="497520cb2d841e5a06e74d5a98484ace"/><dir name="Refunded"><file name="Grid.php" hash="1e99d0e1f0581786bf70a88160ec3f96"/></dir><file name="Refunded.php" hash="47a4d6543c876a18ce1c1ff22254303d"/><dir name="Sales"><file name="Grid.php" hash="7dfa717a33eef263f6b544c0675306de"/></dir><file name="Sales.php" hash="60054b073d8c34b15ea66d6bd3f7a532"/><dir name="Shipping"><file name="Grid.php" hash="cad912fe3caeb0985eb0d4c0b039881e"/></dir><file name="Shipping.php" hash="e316d0d48690abd970b4c141c5990725"/><dir name="Tax"><file name="Grid.php" hash="5dfc953b68e4a62109fa629c20c06be7"/></dir><file name="Tax.php" hash="bc208d765957ce82279e3064ded3b055"/></dir><dir name="Search"><file name="Grid.php" hash="e7a01f1ea16f1d9d55c265064cff98fe"/></dir><file name="Search.php" hash="3a05f1842013e329a50ef10de8e2ee04"/><dir name="Shopcart"><dir name="Abandoned"><file name="Grid.php" hash="bf6c786d1b970cf59c8311b7572abc72"/></dir><file name="Abandoned.php" hash="9dec492b5b9427e33665bf17fba6c75b"/><dir name="Customer"><file name="Grid.php" hash="788ab8c307a5d4cd553e84d4b6c47db2"/></dir><file name="Customer.php" hash="9090ff2cee273d2c92679b5630630328"/><dir name="Product"><file name="Grid.php" hash="0ef43a885784b82f6ef89d71bcb7a734"/></dir><file name="Product.php" hash="8ff5bab3c859c918b1a2aec0e8d9a957"/></dir><dir name="Tag"><dir name="Customer"><dir name="Detail"><file name="Grid.php" hash="0f9c82098981822a78aed00d3ab742b8"/></dir><file name="Detail.php" hash="46d6020901761052081add29cb6147d0"/><file name="Grid.php" hash="3a7d4d314b790654ca48688b542bf640"/></dir><file name="Customer.php" hash="b633430680f3ecabb21790d36d349e44"/><dir name="Popular"><dir name="Detail"><file name="Grid.php" hash="5dacdec00216ba86615d5539ec02f4de"/></dir><file name="Detail.php" hash="ce4df67a20c9524de27dde8470869e37"/><file name="Grid.php" hash="b5252e500072240f169f7fa61d434a53"/></dir><file name="Popular.php" hash="b5b0607a3cf552bcc819c195cdf36d19"/><dir name="Product"><dir name="Detail"><file name="Grid.php" hash="ea51bf4ad4ceb9ee206753688c62988a"/></dir><file name="Detail.php" hash="43783a2ef54ef94f24d7a2553f6ee435"/><file name="Grid.php" hash="819ed22e87ae67bcde4da48abd427c2e"/></dir><file name="Product.php" hash="5bd4dd50ebbc4b47eabe2641634619a5"/></dir><dir name="Wishlist"><file name="Grid.php" hash="9299511da588810ac755136556042fd8"/></dir><file name="Wishlist.php" hash="d0aa5aa6c8e4606def81e523f44e51d8"/></dir><dir name="Review"><dir name="Add"><file name="Form.php" hash="77a0cb812ce6fa64873ea7379b8ea0bd"/></dir><file name="Add.php" hash="7672dcfd881702156c8ec99cedacf880"/><dir name="Edit"><file name="Form.php" hash="569b8e8af07e7e00285f8a9a908e0467"/></dir><file name="Edit.php" hash="9824768ad7efd0cce2e124ea525501fd"/><dir name="Grid"><dir name="Filter"><file name="Type.php" hash="c7921c9184bb43af4c023f66340ec13b"/></dir><dir name="Renderer"><file name="Type.php" hash="64f46835099dffa451f1d680c4d07eec"/></dir></dir><file name="Grid.php" hash="80301b9432c4a2886079198f6ff7a694"/><file name="Main.php" hash="b126553ab4a813852d71105f56243b1e"/><dir name="Product"><file name="Grid.php" hash="fcf4c20d7893e920fb542ab85e64c88f"/></dir><dir name="Rating"><file name="Detailed.php" hash="f0800a9aaab5c19ef372ee88fb3b1d29"/><file name="Summary.php" hash="4bfb40bf34cef17adfc134c64d717147"/></dir></dir><dir name="Sales"><dir name="Creditmemo"><file name="Grid.php" hash="f5dc672a35cef01e79abf2c3fd140297"/></dir><file name="Creditmemo.php" hash="56558a3398da961ce36a66b5b158a14c"/><dir name="Invoice"><file name="Grid.php" hash="480f9efd9932ceec26777e92c01f2d3d"/></dir><file name="Invoice.php" hash="ed9a4ee453db1eca464ba8859626d7b5"/><dir name="Items"><file name="Abstract.php" hash="d65fc7fad538e702aa751eea030cc0ed"/><dir name="Column"><file name="Default.php" hash="6946c313d9f64a83901894df2531956c"/><dir name="Name"><file name="Grouped.php" hash="b35b0ee6d6f71a2355d172ca9703c901"/></dir><file name="Name.php" hash="6662ee4add6e667553200b4d6171466c"/><file name="Qty.php" hash="7c0b9b45cc7d8bef38c6dd0509499bbf"/></dir><dir name="Renderer"><file name="Configurable.php" hash="dcd24c0578b08444f1c132bf50ec1ccf"/><file name="Default.php" hash="84f9c8afd4b4f9cfe04cc74e7b6ee07b"/></dir></dir><dir name="Order"><file name="Abstract.php" hash="cfe43f92adbbfaa57fb3d1e7965759d7"/><dir name="Address"><file name="Form.php" hash="e13c7c896525dee528c99e557799a4f9"/></dir><file name="Address.php" hash="2eddeec050b3857709c48f9fea8a4c80"/><dir name="Comments"><file name="View.php" hash="c199dc5eb0d02645f5becde3e842b978"/></dir><dir name="Create"><file name="Abstract.php" hash="81e46bc556d491ede080bdb0e23e195d"/><dir name="Billing"><file name="Address.php" hash="0b939485b5c8a676d571f293ce8777f2"/><dir name="Method"><file name="Form.php" hash="e4256c7a1dbd0bdea5a4b6d760f11b4b"/></dir><file name="Method.php" hash="c45d7fac998da0377c6bcc74e7d740af"/></dir><file name="Comment.php" hash="2f268404ad87f58567ce0ca19fdd39a8"/><dir name="Coupons"><file name="Form.php" hash="2383aac4e27157179b20536199b04c53"/></dir><file name="Coupons.php" hash="5e46a85fd186f6d01c119fb80fca436b"/><dir name="Customer"><file name="Grid.php" hash="56150e2d838334a5fd269eeaf7ca071e"/></dir><file name="Customer.php" hash="77b91b996cfb6c5b3cb0840fcc4ef7b4"/><file name="Data.php" hash="37aba39dc403b8711e1551d778c380b0"/><dir name="Form"><file name="Abstract.php" hash="945bed3725daac69a1d0fb4d0e0bf108"/><file name="Account.php" hash="d621636d780c46d418c9695871c539b5"/><file name="Address.php" hash="6cc1e2f7e7b56ee4ae64edb6bb75983f"/></dir><file name="Form.php" hash="18dae690c4e98daf91e16a10d1d08756"/><dir name="Giftmessage"><file name="Form.php" hash="b8d6f151a0e2b25375eaa6db06b6b848"/></dir><file name="Giftmessage.php" hash="eb19669bebd36d05aaf3b6d997d05889"/><file name="Header.php" hash="556b9956588fc2dfa6fd12b3847ed467"/><dir name="Items"><file name="Grid.php" hash="2fae2a796d0f2bde347d7eb496799b16"/></dir><file name="Items.php" hash="e45701e862de42bcd4eeab4dd3ddf0e3"/><file name="Load.php" hash="45b7e2f9d50998853fb45bdbcc472d5f"/><file name="Messages.php" hash="d34f695ef4b0403fd47d4c0161fd4100"/><dir name="Newsletter"><file name="Form.php" hash="914f0752990a2e06be7b83cbc9825892"/></dir><file name="Newsletter.php" hash="0f0cd6a5974eb9d896eacd1b7cfcfa04"/><dir name="Search"><dir name="Grid"><dir name="Renderer"><file name="Giftmessage.php" hash="83c6f7d0003f5553c441098d85badf49"/><file name="Price.php" hash="48f58a50d538081ca7f2443ca3727c6b"/><file name="Product.php" hash="7346a6a9498b0df87fa883cde0b786b3"/><file name="Qty.php" hash="bbe4602ff8f2cc2a0561ca8603ee897e"/></dir></dir><file name="Grid.php" hash="75dedd2c80e04889fe10c5e3fef85972"/></dir><file name="Search.php" hash="31a2072387411f13625fc5d35ec25213"/><dir name="Shipping"><file name="Address.php" hash="c2601790fd8926cebfc8b75add688e4b"/><dir name="Method"><file name="Form.php" hash="c4c2c06bba433f8f62c8e777e2d8e287"/></dir><file name="Method.php" hash="b3915ae99b6fcaba1247e1a8d28eb4b7"/></dir><dir name="Sidebar"><file name="Abstract.php" hash="3ebed03c08184ee56c59c383c54b178c"/><file name="Cart.php" hash="219003cac5fb2267e5505cf36b90a2ec"/><file name="Compared.php" hash="a04e16dbcb587df0e4583339cf230ceb"/><file name="Pcompared.php" hash="7ce8be1c6ec23535527ba9f5111db231"/><file name="Pviewed.php" hash="4f314a0dd99634f62cd20518ebe207c8"/><file name="Reorder.php" hash="12ab8948f3d95f1f76530ae9350623ef"/><file name="Viewed.php" hash="c3204f2f1ad1f7cbed86ca6369dc7355"/><file name="Wishlist.php" hash="768c2f25ed4b30b06876095e1f91d588"/></dir><file name="Sidebar.php" hash="632793da8fed6389570ecc383c2a82db"/><dir name="Store"><file name="Select.php" hash="02bb3424df23eaae6e6b63f63f184c44"/></dir><file name="Store.php" hash="fe41572d9e246d7644bd088d7e0c57fa"/><dir name="Totals"><file name="Default.php" hash="5b98dab4e8629aaf19a6c97f786592c1"/><file name="Discount.php" hash="934da712f9b8332e2f3400021e4f8653"/><file name="Grandtotal.php" hash="d3f4a1b83b9d2ec0a983355b166c6b28"/><file name="Shipping.php" hash="1e2369c6573d6e76bed5905f5c216373"/><file name="Subtotal.php" hash="9df8f5ead8321d3706ed6c0246301236"/><file name="Table.php" hash="6b684830a393995f04a9c41942d27a93"/><file name="Tax.php" hash="124f4b0fdaedc0246fc7fb0fb85b1f84"/></dir><file name="Totals.php" hash="4a22c7ca575bb13cce9560826d665949"/></dir><file name="Create.php" hash="ecf540723ed973ce97443027387931d8"/><dir name="Creditmemo"><dir name="Create"><file name="Adjustments.php" hash="28007014ba39d4a6266062483832801d"/><file name="Form.php" hash="174e573c070eab925bef5ee980f8c5ec"/><file name="Items.php" hash="bae662a6ddeab476942212d5c0fd6828"/></dir><file name="Create.php" hash="34a147fabb1fccda6c6d0c4932f16dc8"/><file name="Totals.php" hash="c50553dda8ffaa430d23d27cbe1e5f09"/><dir name="View"><file name="Comments.php" hash="a3721dc8fa17010e4a082e0b059224c7"/><file name="Form.php" hash="80230bb56f6678c7c3b25dd0677ac744"/><file name="Items.php" hash="2c5a4396af8c45368880ed3a560c95e4"/></dir><file name="View.php" hash="7d058e2cd47bb17d9357d35339af8a2d"/></dir><file name="Grid.php" hash="7d3a20c52c8cbf75349e41c7ff75f868"/><dir name="Invoice"><dir name="Create"><file name="Form.php" hash="395d61cc900539dfb13c8bd761a3073c"/><file name="Items.php" hash="092332cdc7c87d561ca138c559d63d5a"/><file name="Tracking.php" hash="e09ff5be816b7a0abf4714880e6bdac0"/></dir><file name="Create.php" hash="9b2d4a728ba9e47b60c0c4892010992a"/><file name="Totals.php" hash="1781ce927df90083570218adc433706f"/><dir name="View"><file name="Comments.php" hash="d6d0fe7549d0a16ed33dedd1d0c1660a"/><file name="Form.php" hash="daf34f636453a85646df61b23c273fe5"/><file name="Items.php" hash="e13e7eb85539b924e73835eebebf4fcb"/></dir><file name="View.php" hash="dfadbd2a21e08f1b3f15ef356e9be8e7"/></dir><file name="Payment.php" hash="77e12694f48508d9230a7fef1522b7da"/><dir name="Shipment"><dir name="Create"><file name="Form.php" hash="36a5fe3ea766065e5e48ba5bcb7487df"/><file name="Items.php" hash="b24d17937066420c0d7e766db5425979"/><file name="Tracking.php" hash="aaf2a0d9a2867ae85a9ce03fe44cb8cf"/></dir><file name="Create.php" hash="510506aa3cacd78dd95bc3197c26009e"/><dir name="Tracking"><file name="Info.php" hash="7aa83ed88c142459f206a5010e078855"/></dir><dir name="View"><file name="Comments.php" hash="5fd4ba584a6d182320f9df0ae90f3910"/><file name="Form.php" hash="5fe10e93bd475e7e47e789dbbae02103"/><file name="Items.php" hash="bffa5130d07646e80e9b5cb865eb1b85"/><file name="Tracking.php" hash="0b704cc61c3f7f5dddfc5f594f0080c3"/></dir><file name="View.php" hash="23f21bef0d5adcf55975ab72c6460070"/></dir><dir name="Status"><dir name="Assign"><file name="Form.php" hash="45a6539e83b043c74870eca5153150a1"/></dir><file name="Assign.php" hash="f4efb3b68f9839b1263f6348dc192865"/><dir name="Edit"><file name="Form.php" hash="9db786f59a6f3918cee474c722ba3d3c"/></dir><file name="Edit.php" hash="e785a3b012013774199f85fd368fe1cb"/><file name="Grid.php" hash="6110594882ea08ca4bb948955d81b18d"/><dir name="New"><file name="Form.php" hash="ffe5922462bb1391b5a65dd49b779bf8"/></dir><file name="New.php" hash="c6b9d52d4dabe7f5b414f3fba6331d1b"/></dir><file name="Status.php" hash="01ab8a664f5cf81e3d7c17385b1d2303"/><file name="Totalbar.php" hash="612f4272fecdb69d05a5a704337f8120"/><dir name="Totals"><file name="Item.php" hash="49b36a8aa28e9865e736dc568415e8a3"/><file name="Tax.php" hash="03c898853755a82afaa87dc374801c46"/></dir><file name="Totals.php" hash="82deaa429c14dfdbbf371a1271256341"/><dir name="View"><file name="Form.php" hash="207cf59aae6caccc72c163b3783d45d6"/><file name="Giftmessage.php" hash="945c6b2076eca5ae9b036a8953d009af"/><file name="History.php" hash="520bbf8bc7a882c169d58f52001c9138"/><file name="Info.php" hash="cfc769f112996d7572d129a7dcf4107e"/><dir name="Items"><dir name="Renderer"><file name="Default.php" hash="74a0744621e064c9506204548b4749d3"/></dir></dir><file name="Items.php" hash="0fff18e1a1b7f7c5b5513c59f3ba27a3"/><file name="Messages.php" hash="ee3a571a62245b04d2788a8754004005"/><dir name="Tab"><file name="Creditmemos.php" hash="388373ad1f7e1201592452e696401d57"/><file name="History.php" hash="a4da5ee3dacf87b202e763183624d09a"/><file name="Info.php" hash="1ad2e10e5d582d98c90fd995ee6e52da"/><file name="Invoices.php" hash="9ca76d9cf4c07d858d44856113d57234"/><file name="Shipments.php" hash="0a2e1523fd635bd25f11f855e1cf7102"/><file name="Transactions.php" hash="38ab10c773cecf891e3f7c9ade285d19"/></dir><file name="Tabs.php" hash="0b904131f72b9ddfa7b0c4ee6ebedbac"/></dir><file name="View.php" hash="5deb4a036505e7b04a3b612121729c27"/></dir><file name="Order.php" hash="afadf83e6c75299399669380d6c4b11d"/><dir name="Reorder"><dir name="Renderer"><file name="Action.php" hash="bfd1b136434667440a22d07591f069fe"/></dir></dir><dir name="Shipment"><file name="Grid.php" hash="4cc1dbe266e1c8f31a0748b3fa8d39ef"/></dir><file name="Shipment.php" hash="f7e1c4f80c3e82cbb896daffb589afea"/><file name="Totals.php" hash="2f7632f2bb942dfd832545afe33bf45f"/><dir name="Transactions"><dir name="Child"><file name="Grid.php" hash="a460d3cb36fc25d14d45ea4c2a7336aa"/></dir><dir name="Detail"><file name="Grid.php" hash="22da4f0251b63d915bb4536c1bf41f68"/></dir><file name="Detail.php" hash="3e87d5fdc781bf4688eb98bdb694d661"/><file name="Grid.php" hash="32f8218c3630e5945bb6c8a5fc0ac5db"/></dir><file name="Transactions.php" hash="e2a63ca3463bb6b16009c834b1f9a068"/></dir><file name="Sales.php" hash="35b765d2eb12b1a6d4263bd50e07edbe"/><dir name="Shipping"><dir name="Carrier"><dir name="Tablerate"><file name="Grid.php" hash="b1009142c2a33b33e531239d445744a0"/></dir></dir></dir><dir name="Sitemap"><dir name="Edit"><file name="Form.php" hash="de3f0df7064876c2b288833fae2b63ca"/></dir><file name="Edit.php" hash="5fbd7ece8374a308104ce20ffb37d228"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="4ac04331972746f470d2776060c2f2c4"/><file name="Link.php" hash="82c57b34298d809a3b873c38a2bca1ed"/><file name="Time.php" hash="200bd46f69d6a7aca518a96face9547c"/></dir></dir><file name="Grid.php" hash="1cc133f0ec2854263407b0f568de0beb"/></dir><file name="Sitemap.php" hash="0d08933c28802e07e0fae81a71b8dea7"/><dir name="Store"><file name="Switcher.php" hash="e89fa899eb07ce013ca6926878765414"/></dir><dir name="System"><dir name="Account"><dir name="Edit"><file name="Form.php" hash="c5b6b813372af1f5952ad84c63c3cd9e"/></dir><file name="Edit.php" hash="1751b8478bd879896b3b4245226da2b8"/></dir><dir name="Cache"><file name="Edit.php" hash="b4705cc7ecc61b4760af37a633fd01b2"/><file name="Form.php" hash="9f7eb62c26683f2c889a7b43b08346e2"/></dir><dir name="Config"><file name="Dwstree.php" hash="90964c109899b1e84896a6e77e1471ae"/><file name="Edit.php" hash="33e60a65dc164ef7dd3c31e7baf6503a"/><dir name="Form"><dir name="Field"><dir name="Array"><file name="Abstract.php" hash="00b2060b40a561793444e9b3e3012bbc"/></dir><file name="Datetime.php" hash="30778860e2d7fb6e39fd54bc2f4f8832"/><file name="Export.php" hash="10fc0fc122b2bae8305cc727bc368512"/><file name="File.php" hash="cf794e7ae5958a42c0df32935ad3d214"/><file name="Heading.php" hash="8284237f336d8104069077c49ff52c4e"/><file name="Image.php" hash="e5fd0d0b80d0c84f77042024ca6d4828"/><file name="Import.php" hash="e095ca6cffad9ceffec20e92f5fe07b9"/><file name="Notification.php" hash="34ca9e3c2b760810e6a5f0ce6490f18a"/><file name="Regexceptions.php" hash="74b26bf9678bcf7e430228523a7a66cc"/><dir name="Select"><file name="Allowspecific.php" hash="3c2b7333ded6d1325b84a2c4a1d1a275"/><file name="Flatcatalog.php" hash="8c67cea1aac3621d128f2ba18f9b80c4"/><file name="Flatproduct.php" hash="352764d26d125269b63ac84d706bb782"/></dir></dir><file name="Field.php" hash="50b7d88f0f34b26de14b0f017435a7ea"/><dir name="Fieldset"><dir name="Modules"><file name="DisableOutput.php" hash="0e6d3c310eddd5217ddf90bfa279c019"/></dir><dir name="Order"><file name="Statuses.php" hash="013475b682964eb175ace0891aaa1e51"/></dir></dir><file name="Fieldset.php" hash="481b055824d85d7936f8c7bc13fa95c1"/></dir><file name="Form.php" hash="9e989082d086b48c921db9dabc458736"/><file name="Switcher.php" hash="d0a52ecb1d9ac6a9668909cf54075782"/><dir name="System"><dir name="Storage"><dir name="Media"><file name="Synchronize.php" hash="b1d41208cef11d1cb4067ab9f5b3cf48"/></dir></dir></dir><file name="Tabs.php" hash="9c837c500ca9230020987f63bcd42566"/></dir><dir name="Convert"><dir name="Gui"><dir name="Edit"><file name="Form.php" hash="26b41b625a77d278c63c7e255c613af2"/><dir name="Tab"><file name="Upload.php" hash="d99d41bd7ddd4e63901d2ef717694373"/><file name="View.php" hash="951b53ae74fbe18a3df4cc8cf5bf11bd"/><file name="Wizard.php" hash="fc29c24b102f3ec858c0093564469ba7"/></dir><file name="Tabs.php" hash="b0a1ab5aee3e789a1e07311987f5e4de"/></dir><file name="Edit.php" hash="520f082dc9483427049395a16234f37d"/><file name="Grid.php" hash="99f3b563d3b37d2f648fe392bb8e2251"/></dir><file name="Gui.php" hash="3b46a32869526091d60c3b31626f150e"/><dir name="Profile"><dir name="Edit"><dir name="Filter"><file name="Action.php" hash="b585b81b7591bf4e44aabae6399cdf52"/></dir><file name="Form.php" hash="49702f6f4dd9ac4fcae70ff53c5614c3"/><dir name="Renderer"><file name="Action.php" hash="9ffab8a562a96ae8e786ea95095f670b"/></dir><dir name="Tab"><file name="Edit.php" hash="17b76310dbfcfbd77c4b7c5f68c1191e"/><file name="History.php" hash="53c0e9407830ae8f27a0d4da4236a3b4"/><file name="Run.php" hash="9514c78865131487e6a646456c920bee"/></dir><file name="Tabs.php" hash="f9ac63365964b56a30cc46e1a317722f"/></dir><file name="Edit.php" hash="b7720fc0d15fd809d4bc034b4f209ff2"/><file name="Grid.php" hash="8b7e25a923e9a01574c43283a5415763"/><file name="Run.php" hash="2582abe39f8cb98e3c72a777721eab99"/></dir><file name="Profile.php" hash="42b086bc1f00d5df2b8b52fdf21b1225"/></dir><dir name="Currency"><dir name="Edit"><file name="Form.php" hash="e9f73b4fcf068bf1d139f68af139d131"/><dir name="Tab"><file name="Main.php" hash="8456870aae352a03138b25282e7cea49"/><file name="Rates.php" hash="c6fd3ac4cfb512c3f25b011d583dd108"/></dir><file name="Tabs.php" hash="00f15c63c0ae0cf667f45527692bdd45"/></dir><dir name="Rate"><file name="Matrix.php" hash="2f21a92c4a66315a7f8b96095d5ab67b"/><file name="Services.php" hash="aef5d69df292d5449ad01e9c721634ea"/></dir></dir><file name="Currency.php" hash="9b76960af433063ab163447658f18e5d"/><dir name="Design"><dir name="Edit"><dir name="Tab"><file name="General.php" hash="0e1a94906393c66e7342480ea0d13fb9"/></dir><file name="Tabs.php" hash="2c8cb3c3e9a63c49660aaa033ef8b021"/></dir><file name="Edit.php" hash="d51850b0ab26999e607bce30a4f5c228"/><file name="Grid.php" hash="874eef7a17ecd7d74adb69f42bdd1814"/></dir><file name="Design.php" hash="942162eeca286679b59d49203cb78647"/><dir name="Email"><dir name="Template"><dir name="Edit"><file name="Form.php" hash="f852f07ed4e0585f2cfbfcb34e803906"/></dir><file name="Edit.php" hash="a41290ee10f508442e103418be7fe9cb"/><dir name="Grid"><dir name="Filter"><file name="Type.php" hash="190819c446794bf15695caaa2b371471"/></dir><dir name="Renderer"><file name="Action.php" hash="6d0644f9ed02727ffba54a66cf8590d7"/><file name="Sender.php" hash="8de2b3f57f49a7455b48d240e820cb70"/><file name="Type.php" hash="ae817f8b96f4fe6b24d9089e1879b9a8"/></dir></dir><file name="Grid.php" hash="7d01c547e9869d16c225800bb50fc54f"/><file name="Preview.php" hash="199c1cf1e8658138f8f16dcc7fd19681"/></dir><file name="Template.php" hash="146d52fd3c51fe60ddfd097172082f6a"/></dir><dir name="Store"><dir name="Delete"><file name="Form.php" hash="19c4a0c00d7f107a0ce93578f461ae39"/><file name="Group.php" hash="b7efba39a4f6eeab20ef87fc0b8c4107"/><file name="Website.php" hash="10fc31f81e2919e951cd5e23e3c7bbe2"/></dir><file name="Delete.php" hash="7bde99ada0550c7d2da16fb4a203ac0c"/><dir name="Edit"><file name="Form.php" hash="bb7926fb1ed052c0f793a28bc8519659"/></dir><file name="Edit.php" hash="b768ff8062539aee074f3668c73e1c35"/><dir name="Grid"><dir name="Render"><file name="Group.php" hash="19bde996fafe2a32557dad45fb04fb36"/><file name="Store.php" hash="53a317fa9cba7bda985ca3c74e2fbba4"/><file name="Website.php" hash="01448326e3f2642e2191bd0abfe3bc90"/></dir></dir><file name="Grid.php" hash="d6d1eece196a3b951476e9715c8435d6"/><file name="Store.php" hash="7e1a3d3c7077983fbcae0502a50dbd16"/></dir><dir name="Variable"><dir name="Edit"><file name="Form.php" hash="741c583a8cce9cee23c1a1eda8073e78"/></dir><file name="Edit.php" hash="d18a392c5b8037ea1e5e92bb7bbea427"/><dir name="Form"><dir name="Renderer"><dir name="Fieldset"><file name="Element.php" hash="f42c11491d7b243f1147f9cd675da468"/></dir></dir></dir><file name="Grid.php" hash="e54ec85d3033b2c090b7b0c199b8c9dc"/></dir><file name="Variable.php" hash="1d4fab2787450cad08d8d40595a6f3f6"/></dir><dir name="Tag"><dir name="Assigned"><file name="Grid.php" hash="b5a6d52d49a3ba0431b2b9860dcef58e"/></dir><dir name="Customer"><file name="Grid.php" hash="1a9d8aadaaa18618e1354cdae5922c67"/></dir><file name="Customer.php" hash="c742d5a11536e316d8f932d86b81c23b"/><dir name="Edit"><file name="Accordion.php" hash="5fd43ec28196fca05b6278b06ec1cf50"/><file name="Assigned.php" hash="6c91f9fcff8ec44edfcc3425552bdff7"/><file name="Form.php" hash="955ea59de807b2887b4dc194c2c2044d"/></dir><file name="Edit.php" hash="376283abdf34687f1fa70ecd575ea9e4"/><dir name="Grid"><file name="All.php" hash="bfef71c238c8ef30899ef09ed240a044"/><file name="Customers.php" hash="9e20ca564eb050d611f94e03b1ff1f33"/><file name="Pending.php" hash="048e0c44a5c0f9fc853ec8c5ddb9e8ce"/><file name="Products.php" hash="eb318c4561a070fdab9add1e1ce3cb24"/></dir><file name="Pending.php" hash="9dce9ce54d365bb1f3b0068bf5f0569f"/><dir name="Product"><file name="Grid.php" hash="0e8a9e663494ebf527235dbeb233aeaf"/></dir><file name="Product.php" hash="29bc4d3e63045d5e3e6b8c9d6eb2a83e"/><dir name="Store"><file name="Switcher.php" hash="210729e2026e4a66567fcca5b80c9d48"/></dir><dir name="Tag"><dir name="Edit"><file name="Form.php" hash="92cb2f0db596644e8a5dce59ee3f1b82"/></dir><file name="Edit.php" hash="db411b17adff669786a923344acce80f"/><file name="Grid.php" hash="f7d99f173d640724ba3eb99882224314"/></dir><file name="Tag.php" hash="3012798a43500c192fad0d71393c0689"/></dir><file name="Tag.php" hash="062e4d7cbd28acf478543f80a92926fe"/><dir name="Tax"><dir name="Class"><dir name="Edit"><file name="Form.php" hash="5db19f786d11ceed45842bfdbf4e728e"/></dir><file name="Edit.php" hash="004521b36c977cd219732b37aac79318"/><file name="Grid.php" hash="ea3bf0238491814e6b92af1b92dba79e"/></dir><file name="Class.php" hash="6a32ae023b81c2ecc184fde83614c5eb"/><dir name="Rate"><file name="Form.php" hash="448795d1c5c9aca7e69988b660273b8e"/><dir name="Grid"><dir name="Renderer"><file name="Country.php" hash="f1673d17101cbcf72ea0f0aa3f312a99"/><file name="Data.php" hash="bb67784874a5df4fc6e121f9ff56fa6c"/></dir></dir><file name="Grid.php" hash="584a4b627f25f80b9ff21eeed9ab32be"/><file name="ImportExport.php" hash="ed63ecc25d825dae5592203309415a78"/><dir name="Title"><file name="Fieldset.php" hash="d732124444fe57dd3d32405f5e272324"/></dir><file name="Title.php" hash="17726c06edf11d5839c294bd3cd5c759"/><dir name="Toolbar"><file name="Add.php" hash="52dbf44cdce239c46b8ac5ee58ab530f"/><file name="Save.php" hash="a4551a0d980ecf8228f222ff54b85658"/></dir></dir><dir name="Rule"><dir name="Edit"><file name="Form.php" hash="85c7788fb65c593d945f6b10c9abc10d"/></dir><file name="Edit.php" hash="773ea89810b8096333f546014d75fcd9"/><file name="Grid.php" hash="79427ec535fe960ff3a5b1052e427411"/></dir><file name="Rule.php" hash="4d0df8c753d6e890f9d77c1f75872ee8"/></dir><file name="Template.php" hash="14eca405228cf7a112966a7bc14ffc66"/><dir name="Text"><file name="List.php" hash="029fb77dd0acea0c243dd4145d5bf2b9"/></dir><dir name="Urlrewrite"><dir name="Category"><file name="Tree.php" hash="c8dc31a96b32b7f9b3f20ce8c57298f8"/></dir><dir name="Edit"><file name="Form.php" hash="81e8ee5e90a76cb7509f5dff106813e8"/></dir><file name="Edit.php" hash="4a6baf31e778a2e4f2860903bb7642c8"/><file name="Grid.php" hash="1d41d0d3cfeafc4386fa63fcf493cc3a"/><file name="Link.php" hash="6541675227464202ca3abf3575df287e"/><dir name="Product"><file name="Grid.php" hash="7ae39023b17c99542eba9709e8ee0217"/></dir><file name="Selector.php" hash="2839bc33664750ae4192248ea75a21b5"/></dir><file name="Urlrewrite.php" hash="022166dfd5a4bd723cf05f9a9259eaa4"/><dir name="Widget"><dir name="Accordion"><file name="Item.php" hash="265eb2bd177612228155a99a62946b01"/></dir><file name="Accordion.php" hash="5df198bfbd3c43f39279821e6d0c7bf1"/><file name="Breadcrumbs.php" hash="fbafd0156843c631e12038408d924b8d"/><file name="Button.php" hash="8d0fa917009b6c35d22fe4a22d3e4106"/><file name="Container.php" hash="495c4ad1e45e517f3a8f234d63a169bc"/><dir name="Form"><file name="Container.php" hash="b374c22ab7d401392c6912c5e2308986"/><dir name="Element"><file name="Dependence.php" hash="24c7f7b417bb471ea3315765f18bc11c"/><file name="Gallery.php" hash="80186fc201d8c9bb787aa583a7e8e4ba"/></dir><file name="Element.php" hash="057277855af91846da02d5982c7282a5"/><dir name="Renderer"><file name="Element.php" hash="818bac6c4097ea657b1fc74e6f7dab2f"/><dir name="Fieldset"><file name="Element.php" hash="190fe2cca8cf47a7d4db9f816af55703"/></dir><file name="Fieldset.php" hash="8953d2d7f83c19ae175c93d21fc37ede"/></dir></dir><file name="Form.php" hash="49c4d1e47fb9540b7fc26a9ea7ab80d2"/><dir name="Grid"><file name="Block.php" hash="2a40f9a41fc1a60626342ef069c47e5b"/><dir name="Column"><dir name="Filter"><file name="Abstract.php" hash="c3b9e6753a14352db8bda30a8daf3bd7"/><file name="Checkbox.php" hash="61239831dd8a2554da7fefdae5950be8"/><file name="Country.php" hash="cb2db6bd10cec8f696baa428039d4f55"/><file name="Date.php" hash="354df7278503599368bc08480e71099c"/><file name="Datetime.php" hash="e1ea71403d1ead7247e35b08ee582efd"/><file name="Interface.php" hash="a072c1c1e4d4a516307ba0c68fd240fd"/><file name="Massaction.php" hash="dccf8c114bc80bc3c38abd06097be6e1"/><file name="Price.php" hash="9b6d16ce8db9fdbd4eadb5dc9852485d"/><file name="Radio.php" hash="35b8359bff48f923a87f1317cc720f01"/><file name="Range.php" hash="a4d31bb2bbd1610276bed24753d85c9d"/><file name="Select.php" hash="a40e2e3263228153962df24f8fafcfa5"/><file name="Store.php" hash="bc7664b22adb3eaa68b35e0b38f8accc"/><file name="Text.php" hash="fcc461268b9911c2af09f6dd98cabe2e"/><file name="Theme.php" hash="55a7360b214e067736ab5d1949c36d17"/></dir><dir name="Renderer"><file name="Abstract.php" hash="1fd43960f7896578ee58e32bbca6b631"/><file name="Action.php" hash="fabb472a27d45148a3de95e9f8595603"/><file name="Checkbox.php" hash="3803c635bd6257a6420abe4ae71c2471"/><file name="Concat.php" hash="7e61eef6d054140be409f009de8e2c2e"/><file name="Country.php" hash="6167eb7467ee4fde679997490125d67b"/><file name="Currency.php" hash="02db8ea13d04fdbac2053e4a6065bb66"/><file name="Date.php" hash="3f7b3eb98f11ebbbb4100bf593ee109b"/><file name="Datetime.php" hash="d893a06798b312c320dc156cf650920a"/><file name="Input.php" hash="6bb6c68160e57648227a138015677a12"/><file name="Interface.php" hash="99cf8919011936286ba09e1b98d2d02c"/><file name="Ip.php" hash="e7a6421d8a679a961be41591049e2c89"/><file name="Longtext.php" hash="f7472ecf6f8b47a549b1550e33b187a9"/><file name="Massaction.php" hash="53c44bdc1cae98e2090487cc13dadaf7"/><file name="Number.php" hash="eda05ad5dd75949be90c30d274fb5e84"/><file name="Options.php" hash="df9aef501788b2975e60364dedd5aa78"/><file name="Price.php" hash="15a7e60aa9344eaaf207b36a8c61a1b8"/><file name="Radio.php" hash="b6890b2fd61ab4291959467b3cbe323d"/><file name="Select.php" hash="e7a320118e460511f934d838678b38a7"/><file name="Store.php" hash="d72beabc7dcd7738f95c329799b63e7e"/><file name="Text.php" hash="f8b042e2db84c0c95e2f5f8c6f37df67"/><file name="Theme.php" hash="24442d7eb03330f38530c572c82e76c5"/><file name="Wrapline.php" hash="93f41583af554f742776d63a9f1e71aa"/></dir></dir><file name="Column.php" hash="5019c9e99324973ab70e3bc9c3ec72af"/><file name="Container.php" hash="d8d9ec58a011e9b75cf1b5ac9f2fa1c0"/><dir name="Massaction"><file name="Abstract.php" hash="5a7c730b3e2381e4aa86f4de2e929187"/><dir name="Item"><dir name="Additional"><file name="Default.php" hash="b408c3123516136077d1deae399d6764"/><file name="Interface.php" hash="4cd99d2e7326c3a45f9d8a3dc5fa7c3f"/></dir></dir><file name="Item.php" hash="40a2051387f0e172ead1c6bf48246eb7"/></dir><file name="Massaction.php" hash="ca7322b12710d53b5f04d3ded5c0745c"/><file name="Serializer.php" hash="a807352b7874b71c93ef4de6653ef83f"/></dir><file name="Grid.php" hash="e6fc43f4d7bdf539096637f06f2bf579"/><dir name="Tab"><file name="Interface.php" hash="196c76f64816a42a0c81c4e8fea8ff0f"/></dir><file name="Tabs.php" hash="cbaacdc0d0065a733bda91523bb14e7f"/><file name="Tree.php" hash="9a9a701f29a1eae5f8339b2072dd9a82"/><dir name="View"><file name="Container.php" hash="664a7d9722d447986471403404dbe78d"/></dir></dir><file name="Widget.php" hash="0c489329ec84d5ae87b95f1da1c39f9f"/></dir><dir name="Controller"><file name="Action.php" hash="faa5fbcb8e77713ba36d1218a2516e0d"/><dir name="Sales"><file name="Creditmemo.php" hash="71518136fbe5562c1cbe947bd6ce0c60"/><file name="Invoice.php" hash="41884dead5505761a01648da6d62106e"/><file name="Shipment.php" hash="2da1b22267db2a80e1fc5430f5c1df24"/></dir></dir><file name="Exception.php" hash="7cf72737b3f68a175583827ff86f47fc"/><dir name="Helper"><dir name="Catalog"><dir name="Product"><file name="Composite.php" hash="02633d24d5a7bbbb34dfe22aec01c874"/><dir name="Edit"><dir name="Action"><file name="Attribute.php" hash="023927dad9f069a9c1e97f5e06b4f877"/></dir></dir></dir></dir><file name="Catalog.php" hash="6b254e82cb5768b0fd704ad9d11e9801"/><dir name="Dashboard"><file name="Abstract.php" hash="24fedd1e076e938d8d4eb01dc8829298"/><file name="Data.php" hash="e5d8148a0508a07bea7ffc240f3dd293"/><file name="Order.php" hash="3edaa16195ebf28906fbe6da6e45913d"/></dir><file name="Data.php" hash="43b4a59a6b174f36ca8e85904b78adcf"/><file name="Js.php" hash="48f939bd32bd117e36f12418165daf44"/><dir name="Media"><file name="Js.php" hash="b1a407526d2de4c44a1ae16e7dbb2445"/></dir><file name="Rss.php" hash="8fee4543b1edbae0a06c7ec086f98700"/><file name="Sales.php" hash="eab42cefb238fa880aa00b6f1edc0396"/></dir><dir name="Model"><dir name="Config"><file name="Data.php" hash="0817646b868680f35e35642413ff7fbe"/></dir><file name="Config.php" hash="4342ded155b401cca9d9f52fcb413222"/><dir name="Customer"><dir name="Renderer"><file name="Region.php" hash="c4e934aa35bc7a0deb0fe7a7358b4396"/></dir></dir><dir name="Email"><file name="Template.php" hash="3612ec4f8bb68482bc4e8c9fbfaea67e"/></dir><file name="Extension.php" hash="f868bdcc5b2dce911d2f71e48bf15b0f"/><dir name="Giftmessage"><file name="Save.php" hash="4ade4653f8b3251928723ac1e1a2580c"/></dir><dir name="Newsletter"><dir name="Renderer"><file name="Text.php" hash="fccdf42cc1230592913ecf12b5902da2"/></dir></dir><file name="Observer.php" hash="3d6b8d1924b96cc74cf2f4ea8e9d0579"/><dir name="Report"><file name="Item.php" hash="8cc29482577b8e8ad086bd548763a364"/></dir><dir name="Sales"><dir name="Order"><file name="Create.php" hash="955da8a47e8060a35627ae2598e35a4e"/><file name="Random.php" hash="dcb95a2237b406e2ae53b159455af77b"/></dir><file name="Order.php" hash="5e25d9ff1810b28b5a1b847380f6f61d"/></dir><dir name="Search"><file name="Catalog.php" hash="8603a42632b1ef7abf66368d6b4d0b3e"/><file name="Customer.php" hash="366363d953cf444c5be78f2ad9f046e9"/><file name="Order.php" hash="7fdd9605ae2f30b63bd5015978bdcdff"/></dir><dir name="Session"><file name="Quote.php" hash="a17ae1350cb5a4bf90dcac60fcad867b"/></dir><file name="Session.php" hash="be3ae8f71e34ccd76735d3d8c438130a"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Admin"><file name="Custom.php" hash="10ff0e2f51e19347ca67aa4927165740"/><file name="Usecustom.php" hash="14a55ecc25d106e04b18f2bdead560fd"/><file name="Usesecretkey.php" hash="cd3ada14a134e6e9e6666f5d0abb210f"/></dir><file name="Baseurl.php" hash="58d6b787932379ce2587d6fa9dccee10"/><file name="Cache.php" hash="a12e39cc2918362bc474e3f60c6ff9ab"/><dir name="Catalog"><dir name="Inventory"><file name="Managestock.php" hash="324e63c99a2afb41e66ee173617d681f"/></dir><dir name="Search"><file name="Type.php" hash="dadcc22aeafd547b1928facddd66353e"/></dir></dir><file name="Category.php" hash="6962c30c81e5fdad4da34c754d75a474"/><dir name="Currency"><file name="Abstract.php" hash="4718a85c1e20520f083b13fd16a74291"/><file name="Allow.php" hash="49a17a33f1950af849341ba566080db3"/><file name="Base.php" hash="9478d9c702e835c12a2083381d71a05a"/><file name="Cron.php" hash="6dcb887ed6e0f2227579863a87f5fde9"/><file name="Default.php" hash="0c49b3316d8fe36d4b7ff8f6f6b0792b"/></dir><dir name="Customer"><dir name="Address"><file name="Street.php" hash="5b7353c3c5307f8718bd44f55633624b"/></dir><dir name="Show"><file name="Address.php" hash="04d0c07fdc3081c0b3ad9341846f8af3"/><file name="Customer.php" hash="c90dd5e3aae4e36e3bc19fe2539860b8"/></dir></dir><file name="Datashare.php" hash="e8964e6c215a78e0a8077edb673b6daa"/><dir name="Design"><file name="Exception.php" hash="9f69c0043ce10ea70fd0a355d14f0892"/><file name="Package.php" hash="a6f65f7dab18e02fd60ee90b6bdbb147"/></dir><dir name="Email"><file name="Address.php" hash="2df223f6231a1af22b93a1dfcc696078"/><file name="Sender.php" hash="00d0e256ee68cba024881b86ea63eab1"/></dir><file name="Encrypted.php" hash="71f97e990b144832714dc51e64145e89"/><file name="File.php" hash="f904207c76fec12d61ef626a8aa3b123"/><dir name="Image"><file name="Favicon.php" hash="e361e1ff791921988169c9f0b8e3df85"/><file name="Pdf.php" hash="aab72514f2cdc91c6095d91d37e24771"/></dir><file name="Image.php" hash="5782878bc742766b7e0d7c46abaa0ede"/><dir name="Layer"><file name="Children.php" hash="90138b0a1213ec903d57c081627d87b7"/></dir><file name="Locale.php" hash="0322e7874796f19bd828b74368da6c16"/><dir name="Log"><file name="Cron.php" hash="aee3ad84dcbfe58b4cc629964365d427"/></dir><dir name="Price"><file name="Scope.php" hash="23e1037fac944e5e771258d5ba6eb208"/></dir><dir name="Product"><dir name="Alert"><file name="Cron.php" hash="17ac4674c795cc5ca1010241b07cf71c"/></dir></dir><file name="Secure.php" hash="770faca41fdd29b5457c4244f923f723"/><dir name="Seo"><file name="Product.php" hash="382fc1b48d83d467b1140a3ec6e94a0c"/></dir><dir name="Serialized"><file name="Array.php" hash="6755f42edf54b007cdc43eb1f925a16e"/></dir><file name="Serialized.php" hash="6d7b978e7cf6ef4451e1ba0b2698e05e"/><dir name="Shipping"><file name="Tablerate.php" hash="99446a8cb442a1bc0bef3e30ad2d5b6a"/></dir><dir name="Sitemap"><file name="Cron.php" hash="e9e315802af5a562a374d057a5c66acf"/></dir><file name="Sitemap.php" hash="9557f42d21cd3de7a4e24e5b67515aa6"/><dir name="Storage"><dir name="Media"><file name="Database.php" hash="2ffb890fbb45ab26b89f58690d841e91"/></dir></dir><file name="Store.php" hash="4092f0f7dbf9c66ab3f6c33d88673048"/><file name="Translate.php" hash="86227866e87c92af637e7e16d8f92907"/></dir><dir name="Clone"><dir name="Media"><file name="Image.php" hash="59b5120a4a1dfc7ddf99deea6e3a012c"/></dir></dir><dir name="Source"><dir name="Admin"><file name="Page.php" hash="be09c3f83d28227a3437041704199db2"/></dir><file name="Allregion.php" hash="a04511ae0cfeb20354dd9d58e53c01f3"/><dir name="Catalog"><file name="GridPerPage.php" hash="b5a050df4dd52521d06983d77ccb9493"/><file name="ListMode.php" hash="d73436551ef3607e2606a62a6d38aade"/><file name="ListPerPage.php" hash="aaf7310d22e48b43e5eeaf10e8f061a2"/><file name="ListSort.php" hash="840a02e1cf2759c92b0b2d80823e98b8"/><dir name="Search"><file name="Type.php" hash="15aebe64a3eaa917e954537de64d8417"/></dir><file name="TimeFormat.php" hash="8d9ca0af2671a80542f9afef068533bf"/></dir><file name="Category.php" hash="e2330404208d5406ed5b1f6dbee0a83c"/><file name="Checktype.php" hash="b57d81fe805cd1617c69946e3d5e27bd"/><dir name="Cms"><file name="Page.php" hash="45117c2fb39fd588efa493abef076dda"/><dir name="Wysiwyg"><file name="Enabled.php" hash="d8f6680430e0ac4a1113eb81423f8c5e"/></dir></dir><dir name="Country"><file name="Full.php" hash="d5b9d2cfc5ac849cbeb7eac661111b7a"/></dir><file name="Country.php" hash="b005e81844de707b734ec5b925c0f49d"/><dir name="Cron"><file name="Frequency.php" hash="e3a404095e3fabab7b56a96d7ee47e96"/></dir><dir name="Currency"><file name="Service.php" hash="34ddba5faa4af23c10050fb61e185b4f"/></dir><file name="Currency.php" hash="5ca786c26c35a1b4000095b18236d75a"/><dir name="Customer"><file name="Group.php" hash="29fe66a793f112f9f166aacfdff7d8fe"/></dir><dir name="Date"><file name="Short.php" hash="97ffc59c0d1f438c570ab1e51b912c79"/></dir><dir name="Design"><file name="Package.php" hash="94093928164937112512c08fa059f501"/><file name="Robots.php" hash="0f68db14c82b83ad796ed54a5d946e30"/></dir><dir name="Dev"><file name="Dbautoup.php" hash="235af4666a886a4e872951fcf4ed9aaa"/></dir><dir name="Email"><file name="Identity.php" hash="debee482ea682e8ffc0eeec4e747f45d"/><file name="Method.php" hash="b46ba160c6b6dbd696511c31213e666e"/><file name="Smtpauth.php" hash="953a59dfbeac54e85c953c3a091c5c78"/><file name="Template.php" hash="35464e73b3db3b5b05c32516aae64e27"/></dir><file name="Enabledisable.php" hash="71547d44f0f6b9cef950a32ab4c3a37a"/><file name="Frequency.php" hash="5489616080caeb277f055423d3143a7c"/><file name="Language.php" hash="b1692cdafbccf657c5eb64880755fa4c"/><dir name="Locale"><file name="Country.php" hash="f88ada8d26cd30238d800e39ca04bbf0"/><dir name="Currency"><file name="All.php" hash="c28c67bdddf43e22c757bc1b354d8105"/></dir><file name="Currency.php" hash="79e8603abd945f806a12252241a61c30"/><file name="Timezone.php" hash="34da8a47a4d379bf2f6e3a4a1ac06497"/><file name="Weekdays.php" hash="aaba5fced61b0d562b2144fc11931851"/></dir><file name="Locale.php" hash="dd9ae79247f794ec847e2515ae93042d"/><file name="Nooptreq.php" hash="638d624aa3d0b554d5beb9c52daddf3f"/><dir name="Notification"><file name="Frequency.php" hash="7e8c2d89514335c82636c924ede7593f"/></dir><dir name="Order"><dir name="Status"><file name="New.php" hash="1e3f4b4b0deb524ca270bbcc21512573"/><file name="Newprocessing.php" hash="7faa9e59171be2471fe30a9c1fc9f73d"/><file name="Processing.php" hash="bf5eb08f157ae0ffd5d4fcdc925fc393"/></dir><file name="Status.php" hash="bbcad1d3c8f3e85582ac624d7e981c16"/></dir><dir name="Payment"><file name="Allmethods.php" hash="ab62cc656091d2b3351e56b0da3b6803"/><file name="Allowedmethods.php" hash="e19e6031c832d35e023e321ac87a59d0"/><file name="Allspecificcountries.php" hash="7ca4ed5767a8ea2089b1c4667893cc07"/><file name="Cctype.php" hash="56ebff3911cdd356b275bef9ebb5ba5b"/></dir><dir name="Price"><file name="Scope.php" hash="ad1fc3a3d6e9f697a0438c04f681debf"/><file name="Step.php" hash="ee2faa30f49918d6fbcee0af626f25bb"/></dir><dir name="Product"><dir name="Options"><file name="Price.php" hash="9cf1a5cf915dbb04f73f9fd657d27fb7"/><file name="Type.php" hash="4cb9bd1e9d637a5f289b90d02afe26de"/></dir><file name="Thumbnail.php" hash="4f71419b350c212b2f9ec0afb5c9054d"/></dir><dir name="Reports"><file name="Scope.php" hash="a8304ae38cb00c8ae8b91cf444f9d01e"/></dir><dir name="Shipping"><file name="Allmethods.php" hash="9cab9b4de1ab7928a690a9ab7fa493de"/><file name="Allowedmethods.php" hash="55b2467f06a03c94e6d221c74c88f559"/><file name="Allspecificcountries.php" hash="7ddc68c81a5cc902bef3f9fc8851fcf1"/><file name="Flatrate.php" hash="6c6fe0e7c39bb86ef623c26063921b8e"/><file name="Tablerate.php" hash="651044cb0650997de61a112d37200f0b"/><file name="Taxclass.php" hash="4a03ff25199bfa841ba502901a5a4d11"/></dir><dir name="Storage"><dir name="Media"><file name="Database.php" hash="5bb37032fc14851de9ac59c999402def"/><file name="Storage.php" hash="46a8e25f0fc0784d73504e52855b0d23"/></dir></dir><file name="Store.php" hash="4809bdeea0c16944c4b7f9af5016493a"/><dir name="Tax"><dir name="Apply"><file name="On.php" hash="ac9f14e6894a5bf791b70129faf43924"/></dir><file name="Basedon.php" hash="5681cbb45b6d8329ad409c7882fd2fbb"/><file name="Catalog.php" hash="5e2967c9059076c222c25d0ca04f1630"/></dir><dir name="Watermark"><file name="Position.php" hash="f4999592da24ca9d91cb51a2621d3918"/></dir><dir name="Web"><file name="Protocol.php" hash="9b3ca4ec8f1b23c330fdfacbed273503"/><file name="Redirect.php" hash="c810a794ce380ce68ae0af4c42779a49"/></dir><file name="Website.php" hash="87412c9ba722c0edf2df28367b08e2f5"/><file name="Yesno.php" hash="c3e1c7126b8076ac775b8f5a0350b353"/><file name="Yesnocustom.php" hash="5363490d066f27ab32268632442a2bdd"/></dir></dir><file name="Store.php" hash="1d192cac15d178eb0362cf2fffa97fc8"/></dir><file name="Url.php" hash="0119ac82aeaffb57ef925ed448896fc6"/></dir><dir name="controllers"><file name="AjaxController.php" hash="85e12777b77b3d5bbed6f95ad569b615"/><dir name="Api"><file name="RoleController.php" hash="6414ef55387ef02e302286d24552e3d8"/><file name="UserController.php" hash="fd6c5c0699524b5483451aa20228d16f"/></dir><file name="CacheController.php" hash="f0800d706f002885785de69707e0abf1"/><dir name="Catalog"><dir name="Category"><file name="WidgetController.php" hash="b17a0422ea1e6dc33a80966ed430933b"/></dir><file name="CategoryController.php" hash="432e80aac2661d02fadf9b9eea798f48"/><dir name="Product"><dir name="Action"><file name="AttributeController.php" hash="dca87daaa9ac26ee9117dcc854eed50d"/></dir><file name="AttributeController.php" hash="8719116950a3e762c5db5f64d91246cc"/><file name="DatafeedsController.php" hash="414607208ad2c2f7363866d77b9ad8ec"/><file name="GalleryController.php" hash="e2860aa986115a850e00f5b60128bfe0"/><file name="GroupController.php" hash="d6fe706d8afbca6b561e40fc665cdae4"/><file name="ReviewController.php" hash="828c8b118ef0a49dff4884b16074e4e4"/><file name="SetController.php" hash="b24e68a88f0dc02b29675a2c2bbc5906"/><file name="WidgetController.php" hash="d6c246295b40c21c7feae0097d9ddb5e"/></dir><file name="ProductController.php" hash="9dfc8e53fe2a8672c7ed828f3702cb99"/><file name="SearchController.php" hash="571ea0bafc5f6e63482ce0520d4b84d5"/></dir><file name="CatalogController.php" hash="44a796112ec3d828ead69055f88ce34e"/><dir name="Checkout"><file name="AgreementController.php" hash="f88e851a9d3a523a40cf36ffbdceed61"/></dir><dir name="Cms"><dir name="Block"><file name="WidgetController.php" hash="426f2e1c4ed9a7b2cf69607d23f0c614"/></dir><file name="BlockController.php" hash="867676c532e753cec92c3bc23404fcde"/><dir name="Page"><file name="WidgetController.php" hash="647784d62e224d84c771d12f60bc891c"/></dir><file name="PageController.php" hash="aa440af5608bbd25aa3f45875f9d0bea"/><dir name="Wysiwyg"><file name="ImagesController.php" hash="52d1bf407b0700fb38361c8c4616fb30"/></dir><file name="WysiwygController.php" hash="b234098e0ef7dbb9c8ab816060f5bcf4"/></dir><dir name="Customer"><dir name="Cart"><dir name="Product"><dir name="Composite"><file name="CartController.php" hash="08ec7c8d390baa2e5332a3ceefc93fd8"/></dir></dir></dir><file name="ConfigController.php" hash="a171433c2f8fb27b9ac6bef0d272518d"/><file name="GroupController.php" hash="82118737dde6f957abff4d59e08315eb"/><file name="OnlineController.php" hash="203c3afb7234984e20e96dcf2bc62a46"/><dir name="Wishlist"><dir name="Product"><dir name="Composite"><file name="WishlistController.php" hash="75d9133cd1995532ac80151d31a5db8f"/></dir></dir></dir></dir><file name="CustomerController.php" hash="157350ed69430e590c39f24f4f8e36be"/><file name="DashboardController.php" hash="09dc73da83e255bf1d12267cc5a901cc"/><file name="IndexController.php" hash="74495034d108b47eee2df300bb34b045"/><file name="JsonController.php" hash="40c481d1af1120f2c2f2e26b584e2b6f"/><dir name="Media"><file name="EditorController.php" hash="9042025e54e8a3d8eb4e5b0bdf10965a"/><file name="UploaderController.php" hash="932defa0cdc9c24f43e0f50b0005abb4"/></dir><dir name="Newsletter"><file name="ProblemController.php" hash="024c10f2fadac0cf069e16aec4e2320e"/><file name="QueueController.php" hash="9a53cd21429fbc5e8cf9a0939c5d6188"/><file name="SubscriberController.php" hash="eb1024fd302685633ae1bccae7bcf332"/><file name="TemplateController.php" hash="c3d3dabb17d03afc8eefc00701cd92f4"/></dir><file name="NotificationController.php" hash="46c7f12306695c82e8fbe6afd87e0ca2"/><dir name="Permissions"><file name="RoleController.php" hash="f9ddd203c5f501018c66f5216af2cb0c"/><file name="UserController.php" hash="dadc20e27cf8b1d44951ff0b4615595a"/></dir><dir name="Poll"><file name="AnswerController.php" hash="d581ef89d526ac4127c692ffadb462ba"/></dir><file name="PollController.php" hash="d623dae18b11becf8d6d938da5d174cc"/><dir name="Promo"><file name="CatalogController.php" hash="9f2e56ec610a54a77e7c12b8ef0719bb"/><file name="QuoteController.php" hash="13b25e058c62829bec4f577615280115"/><file name="WidgetController.php" hash="604214722a4baf9d8422fc1fe67f965d"/></dir><file name="PromoController.php" hash="97cc5683dce6062b4bfbe005ded38bec"/><file name="RatingController.php" hash="36b8d7e56cbce8bbc2735dc0e6c3852c"/><dir name="Report"><file name="CustomerController.php" hash="429a673c4cd07ac93f77e91c2ecec035"/><file name="ProductController.php" hash="7db5a06776ddbf101ad98dd8816ec6c1"/><file name="ReviewController.php" hash="5e7ba8bfb91a5e38450ccf3d535b1d63"/><file name="SalesController.php" hash="9c62bb9bfad0010f64ce278c5fd24f4a"/><file name="ShopcartController.php" hash="1e1af5b7c9185973df8971dd86581985"/><file name="StatisticsController.php" hash="0b2245f0fcb40ab2ec5f9849df0db8e6"/><file name="TagController.php" hash="dcc04dc508669bf542effe1f9042a7f0"/></dir><file name="ReportController.php" hash="11e8929fab640d11d17364ac53a3ad5d"/><dir name="Rss"><file name="CatalogController.php" hash="9273158308f2fa4b90a7c6f38b7bf3b1"/><file name="OrderController.php" hash="eee8183361cb8ad401bb63b87dea0afe"/></dir><dir name="Sales"><dir name="Billing"><file name="AgreementController.php" hash="23a1a3e03134e121169b918ae328f0ad"/></dir><file name="CreditmemoController.php" hash="1cf8cca24d46aa4dae03cf99ef5222af"/><file name="InvoiceController.php" hash="9680882871b27d7d954a00dac988f6c1"/><dir name="Order"><file name="CreateController.php" hash="67306136414d067088b8d32b54987d52"/><file name="CreditmemoController.php" hash="65cb42fca2918671abbfd8355bc4d57d"/><file name="EditController.php" hash="668df97818a7b5d16afc79a5bc95c02e"/><file name="InvoiceController.php" hash="7c8a4637447fda564186f01b5b528c58"/><file name="ShipmentController.php" hash="0443d932773584bffd01666dda5f2c25"/><file name="StatusController.php" hash="6fe19abd8facab586be0ffca020816f0"/><dir name="View"><file name="GiftmessageController.php" hash="4c3736bacb9d5d82bafb88c09e7e6423"/></dir></dir><file name="OrderController.php" hash="ee02f87204c8fd594bfaaa6a6e573025"/><dir name="Recurring"><file name="ProfileController.php" hash="321adffe7b9b70a22bde636469f8f203"/></dir><file name="ShipmentController.php" hash="a35fe7cd49cac8650edba3edc869b4d5"/><file name="TransactionsController.php" hash="ce8d3af197203e5aab2acc806f4667a6"/></dir><file name="SalesController.php" hash="d308dd2cef7e5c2b06954dfc6387468d"/><file name="SitemapController.php" hash="79cdefacc6b1958a5bb1cba6f2a93494"/><file name="SurveyController.php" hash="231420b326f7c0d348225475c1dfac58"/><dir name="System"><file name="AccountController.php" hash="ae056e8638a51a6ca6c518977fd44184"/><file name="BackupController.php" hash="09f4a4f89522c24ab8e425322cc74520"/><file name="CacheController.php" hash="2f25eaa24d2f1dc1720b99eaba0d131e"/><dir name="Config"><dir name="System"><file name="StorageController.php" hash="d2ee076aa8d4819ee395edd172f840ed"/></dir></dir><file name="ConfigController.php" hash="17f446064133df0a871700e892235f74"/><dir name="Convert"><file name="GuiController.php" hash="1a247b09f035ee16904f1ecaa726d407"/><file name="ProfileController.php" hash="db1c2b885e1c570d322b610151ac80f9"/></dir><file name="CurrencyController.php" hash="3a38985a27f06c56d7f5e373acdaeab6"/><file name="DesignController.php" hash="61cf8e2ed6a956c3f01b4e8b71c9bf2d"/><dir name="Email"><file name="TemplateController.php" hash="5b1b45a959fb1c44c77a16b26bce1151"/></dir><file name="StoreController.php" hash="5320ea79b36431ca098570c81d00097b"/><file name="VariableController.php" hash="d66726f1438689f9b2ec866fa4a14807"/></dir><file name="SystemController.php" hash="56d83114e90de8e0faa475b744539481"/><file name="TagController.php" hash="4e191f62f6ca755ca8a5f1cddff255c2"/><dir name="Tax"><dir name="Class"><file name="CustomerController.php" hash="161740aba75e33f0aff092da35697e0d"/><file name="ProductController.php" hash="84c3c0c3387a755836c86cbec8dcef0a"/></dir><file name="ClassController.php" hash="6a3242c60792d3845bd632eb6ea4e702"/><file name="RateController.php" hash="380e0195c7d29e40a1e9cfd2d34e44c2"/><file name="RuleController.php" hash="93a53fba09ff8cac417f90436a54cb1c"/></dir><file name="UrlrewriteController.php" hash="74893ce8b6d44df549326645a2086056"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0b75515ea727604b77231e3839a0d455"/><file name="config.xml" hash="80fdb622109b78ee83a7c2743a2cef8c"/></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Mage_Adminhtml.csv" hash="5a2e0b8ec133996085952b420cba6aa3"/></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.5.0.0</min><max>1.6.0.0</max></package><package><name>Lib_Js_Calendar</name><channel>community</channel><min>1.51.1</min><max>1.52</max></package><package><name>Lib_Js_Ext</name><channel>community</channel><min>1.5.0.0</min><max>1.6.0.0</max></package><package><name>Lib_LinLibertineFont</name><channel>community</channel><min>2.8.14.0</min><max>2.9</max></package><package><name>Lib_Js_TinyMCE</name><channel>community</channel><min>3.3.7.0</min><max>3.3.8</max></package></required></dependencies>
-</package>
diff --git a/var/package/Mage_Downloader-1.5.0.0.xml b/var/package/Mage_Downloader-1.5.0.0.xml
deleted file mode 100644
index 29839deed5..0000000000
--- a/var/package/Mage_Downloader-1.5.0.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Mage_Downloader</name>
-    <version>1.5.0.0</version>
-    <stability>stable</stability>
-    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Magento Downloader</summary>
-    <description>Magento Downloader</description>
-    <notes>1.5.0.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:01:48</time>
-    <contents><target name="mage"><dir name="downloader"><dir name="js"><file name="prototype.js" hash="3766aeff5778b54f74f93670322ca0df"/></dir><dir name="Maged"><dir name="Connect"><file name="Frontend.php" hash="48d338283c3df83d74d8dcd582b0a03b"/></dir><file name="Connect.php" hash="aec43a7972c625059432061028212fed"/><file name="Controller.php" hash="18fbd4e37a955645c3524592c9cf4947"/><file name="Exception.php" hash="39cf29349086fe0eba9947d9fb3ed55c"/><dir name="Model"><dir name="Config"><file name="Abstract.php" hash="5b5f589180eb693fcbad0f620ce7c32f"/><file name="Community.php" hash="588f8a2f97b7249926cd1855fedd24f4"/><file name="Interface.php" hash="770d696a8b5768fa3233e1e7a009ceab"/></dir><file name="Config.php" hash="c693f57c833379737036d425b6b29385"/><dir name="Connect"><file name="Request.php" hash="fb34495148ddc6f3a79071da32d3b38f"/></dir><file name="Connect.php" hash="d74b1c342eb129c73d9654f29c3f2fbd"/><file name="Dowloader.php" hash="f23e77fd734535c59a3eae2fa50d79b5"/><file name="Session.php" hash="d2636d68fc3a67136b3574130b2d2f7a"/></dir><file name="Model.php" hash="80b265f3ffa9b47bfe4578ad02f98bf4"/><file name="View.php" hash="70c788d6ddb354fdfca13b1eb5535ee6"/></dir><dir name="skin"><file name="boxes.css" hash="6f04f75ff84cf4e95d949842a15dd43a"/><file name="ie7boxes.css" hash="2e73208a3868ed0bac402e831352b50f"/><file name="ieboxes.css" hash="4031254314b6226cc911e6bc1774873d"/><dir name="images"><file name="Magento_Connect.jpg" hash="20e1378c09506fdc5723abc0115d5f57"/><file name="ajax-loader-tr.gif" hash="1ae32bc8232ff2527c627e5b38eb319a"/><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="header_bg.gif" hash="8440b04c5cb6b1451bb886bfbef260a5"/><file name="logo.gif" hash="5eb089ecea67d82311d7c91898460104"/><file name="nav_bg.gif" hash="1cb1366f03a9efad6b17e4483aef20cf"/><file name="nav_separator.gif" hash="492011a7de2de84a9c7837bfd879ab95"/></dir><dir name="install"><file name="boxes.css" hash="192f1eca44db5b9bd7e026a24d51918d"/><file name="clears.css" hash="2165383fa985039fa903fd1a9e33850e"/><file name="ie7minus.css" hash="25c006464562ddea7ebb79d5674095e5"/><file name="iestyles.css" hash="7fa949c56e46a2477b3de8fa524c2827"/><dir name="images"><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="footer_bg.gif" hash="d59784af16fd95ea82226e5708a89232"/><file name="footer_container_bg.gif" hash="d468e3943943cbbf711586e69d40ca42"/><file name="footer_info_separator.gif" hash="7da64eefaf4da3855ab6ee76dbced0c2"/><file name="footer_informational_bg.gif" hash="72d37f4b2ea747bf8969c2654ad1d1e0"/><file name="footer_left.gif" hash="2b15a54bea9409a75c142d14a62f0149"/><file name="footer_legality_bg.gif" hash="4eb1602e3369dccd901ffe98ea0fd4b3"/><file name="footer_right.gif" hash="a45eaf35c8797d299bd4d9b936528e8f"/><file name="header_bg.gif" hash="795c6de754d0d49717ed08d5cd8168c8"/><file name="header_nav_bg.gif" hash="80c6a18686eb0243e06d6176506a2502"/><file name="header_top_bg.jpg" hash="143f524392ee62fcc8183f5930d7258b"/><file name="header_top_container_bg.jpg" hash="294c18f3f6b838bba06ae41dd3c3d638"/><file name="logo.gif" hash="073a947a39b967af678455a5c7f66e90"/><file name="main_bg.gif" hash="cf18ba9f7c7e6b058b439cde1a897e9c"/><file name="main_container_bg.gif" hash="a8f5717873dc6cf8f6bd22924b5838fe"/><file name="note_msg_icon.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/></dir><file name="reset.css" hash="4a6590608aa9af7fe69195a8475a8e51"/></dir></dir><dir name="template"><dir name="connect"><file name="iframe.phtml" hash="3c22e3af517d4644d72579b591fdeb95"/><file name="packages.phtml" hash="33448afc56a415dad071435bfdbf3a9f"/><file name="packages_prepare.phtml" hash="5f9945bcc451a1301967212226bff109"/></dir><file name="exception.phtml" hash="1e393d59669a79ca944ac159c8551f2e"/><file name="footer.phtml" hash="d9b3b42c7115fcf2165a6224dc8f2faa"/><file name="header.phtml" hash="c53e6825af1e21fe5ceec6a3eeb66dee"/><file name="index.phtml" hash="7076bb37c3d99345bab82e7e8a7514f7"/><dir name="install"><file name="download.phtml" hash="af04d8b4814cefeae261e3f40a543e98"/><file name="footer.phtml" hash="67035179d790b92f0ba308994d57cc5e"/><file name="header.phtml" hash="1209f2f1a037b81e5e8d16cce9485763"/><file name="writable.phtml" hash="9adb03c2bbaabadda1c8a245d61ae01f"/></dir><file name="login.phtml" hash="57d45ae982bd79122569453db4cc1c04"/><file name="messages.phtml" hash="31427aa364773f81c7091a881c83b48f"/><file name="noroute.phtml" hash="5391f7ff0d774d7ab2d0c961ad023f36"/><file name="settings.phtml" hash="aa1ee69a7720f6d005e37556c5953104"/><file name="writable.phtml" hash="ed4aa83fb6c09e6806d2da9b363dda8e"/><file name=".htaccess" hash="72617d60821288133a367f70bf39ad93"/></dir><file name="index.php" hash="e4a27d2dd7490f4ad7330754b42d4d87"/><dir name="lib"><dir name="Mage"><dir name="Archive"><file name="Abstract.php" hash="05b012769210d9ff74f314df156d8b96"/><file name="Bz.php" hash="f93e016426ac14fac5a82d35a3d3c3cb"/><file name="Gz.php" hash="9826cb191b31c072fbc944dca6bf6315"/><file name="Interface.php" hash="283914c36fdcf9851ec651149176fff7"/><file name="Tar.php" hash="b38387167ad4e2a010d8d103f0f14c14"/></dir><file name="Archive.php" hash="5b21935c5c7352556aff4b8b66c2f24f"/><dir name="Autoload"><file name="Simple.php" hash="8224c236e855e9b0c82c8af15ff7a247"/></dir><dir name="Connect"><dir name="Channel"><file name="Generator.php" hash="bcc62dfd017bd66d7ef664b7ba6984df"/><file name="Parser.php" hash="982da86ddf42de2563ffd0b528e28aaa"/><file name="VO.php" hash="7608c320f8a77125d16c7931d22c4233"/></dir><dir name="Command"><file name="Channels.php" hash="5747dec648654aaccdf0bdf2376b656a"/><file name="Channels_Header.php" hash="51996c5f62a39da18d55d5ecc2fe8cc6"/><file name="Config.php" hash="629097cfb5729592f3a35c841288e89f"/><file name="Config_Header.php" hash="436d22cb136a31ebb41c1e0ce58914d7"/><file name="Install.php" hash="0eb382c3118905457edf0f7e55b7fb0f"/><file name="Install_Header.php" hash="31bf47482b7142438966eb775e0ffc12"/><file name="Package.php" hash="00442973fb35559bb3593cc2c23e2656"/><file name="Package_Header.php" hash="3b05021bb5b0ff7006d3e3e8b87fb880"/><file name="Registry.php" hash="b496e7e78728655797c10a28ef57ae92"/><file name="Registry_Header.php" hash="450ea2b1496b0c58d3b8e6a9c2689a09"/><file name="Remote.php" hash="5a6419a531483853fa007f8b02117276"/><file name="Remote_Header.php" hash="6a738321397ccdc430decc7d9236c3fb"/></dir><file name="Command.php" hash="4f145c33584a8dccbbf283a79b1d5451"/><file name="Config.php" hash="e75f985f347177880326c646b35c6562"/><file name="Converter.php" hash="e2f9256df6736987daea1c66419d7ed1"/><dir name="Frontend"><file name="CLI.php" hash="076d33621a3cd245e3165445feb1eef9"/></dir><file name="Frontend.php" hash="262446f93465160df320184e5629e9e9"/><file name="Ftp.php" hash="967eb8913d83d2dab3028ca2ea34bc5a"/><dir name="Loader"><file name="Ftp.php" hash="b99e2d1a7cded94547f43fa77ff26691"/></dir><file name="Loader.php" hash="e1e1302b40c880b09c8db9ed80574a87"/><dir name="Package"><file name="Extension.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="Hotfix.php" hash="de07828381d34903fa72fb2abc29c030"/><file name="Maintainer.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="Reader.php" hash="1204a29330647f55ca32627abade2021"/><file name="Target.php" hash="136a824007b89c066cfc153dea691e48"/><file name="VO.php" hash="3e6359bd9a305412656dae835fc96916"/><file name="Writer.php" hash="e525d40b82faa04b6273115863c43ff8"/></dir><file name="Package.php" hash="2170dc85d1a1b5fd9ce21213367a9c4f"/><file name="Packager.php" hash="6fbf0830bb9281a515390c41ca6917c9"/><dir name="Repository"><file name="Abstract.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><dir name="Channel"><file name="Abstract.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="Commercial.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="Community.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="Core.php" hash="68b329da9893e34099c7d8ad5cb9c940"/></dir><file name="Channel.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="Local.php" hash="68b329da9893e34099c7d8ad5cb9c940"/></dir><file name="Repository.php" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="Rest.php" hash="d72f70b08bff0baaa491633fc02f0c9e"/><file name="Singleconfig.php" hash="23674229ba247e752bdf986cbd83c9eb"/><dir name="Structures"><file name="Graph.php" hash="71f17187942acd395910e7feee192728"/><file name="Node.php" hash="5e6f99e9cb28e44e5b040a97794075f8"/></dir><file name="Validator.php" hash="7a22be1f4970deecdf2a0247d0006852"/></dir><dir name="DB"><file name="Exception.php" hash="0243a545ddb181bc3fd809fe3ce95adc"/><file name="Mysqli.php" hash="e4808590a6178bf0497a395563420b3d"/></dir><file name="Exception.php" hash="bf7fb7390f69e0657d8d9e4035dbc09c"/><dir name="HTTP"><dir name="Client"><file name="Curl.php" hash="fd30afca5a951901807502d3031b02cc"/><file name="Socket.php" hash="c2eb329daa669a8ae94978d8d7476150"/></dir><file name="Client.php" hash="3b4f3596fcc5a3cfe69152db67f36bf4"/><file name="IClient.php" hash="0cd7713c32d5bfc9b05b2fb95474f1d9"/></dir><dir name="System"><file name="Args.php" hash="ee84c80fea7cea2c45909f9fb412bd14"/><file name="Dirs.php" hash="b30a793a268be989d7eddc2e5e15c023"/></dir><dir name="Xml"><file name="Generator.php" hash="01527ac4492823a181c1a2ee819b7f34"/><file name="Parser.php" hash="326acb911794fc89acfadc942f3346d1"/></dir></dir></dir><file name="config.ini" hash="4c5c7167aca37a2c5dbcb6a0e0a5d05a"/><file name=".htaccess" hash="520cc012c84739584526b8a9ff098e23"/><file name="mage.php" hash="7ab8292042377fa14f293f163bd77650"/></dir><dir name="."><file name=".htaccess" hash="6b15b86296896a105ff0d317830db5bc"/><file name="index.php" hash="20b1633bd332a08e643afa4590ab8564"/><file name="mage" hash="091c45355c62a9189cff45c09328037c"/></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
-</package>
diff --git a/var/package/Mage_Locale_en_US-1.5.0.0.xml b/var/package/Mage_Locale_en_US-1.5.0.0.xml
deleted file mode 100644
index aa98675d11..0000000000
--- a/var/package/Mage_Locale_en_US-1.5.0.0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Mage_Locale_en_US</name>
-    <version>1.5.0.0</version>
-    <stability>stable</stability>
-    <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>en_US locale</summary>
-    <description>en_US locale</description>
-    <notes>1.5.0.0</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:01:49</time>
-    <contents><target name="magelocale"><dir name="en_US"><file name="Mage_AdminNotification.csv" hash="2cd6487d36930c74bba55b781c01c938"/><file name="Mage_Api.csv" hash="14573b66785dafd2e280ed25373a3ef3"/><file name="Mage_Authorizenet.csv" hash="204c3901c67b312a9ea21ffdf34fa9c3"/><file name="Mage_Backup.csv" hash="f1ec2ffe28c867ddeebdca40a8fadd91"/><file name="Mage_Bundle.csv" hash="fb965a6b2bdd88ca81fb93d9ceca9bed"/><file name="Mage_Catalog.csv" hash="e8abeb3871b305f0fe0c15e72ee4169d"/><file name="Mage_CatalogInventory.csv" hash="fd87f3a30cf42db30d7dc685a09e0f09"/><file name="Mage_CatalogRule.csv" hash="c7f749f64a7337a7bbf00e2daa46390f"/><file name="Mage_CatalogSearch.csv" hash="90384570dde96d595a9cc72dfc0c2f6f"/><file name="Mage_Checkout.csv" hash="e2ea0713279ecd7bc4d546f05fdc5a6d"/><file name="Mage_Cms.csv" hash="5f3d13017025dab1a7d076a212bd7281"/><file name="Mage_Connect.csv" hash="8cd1b22e3bb2b18a59b6bfb6a7e4e7f9"/><file name="Mage_Contacts.csv" hash="7e367e9a924c19b6df2fa5c8adca9be4"/><file name="Mage_Core.csv" hash="b9b1f376c81060fa0915e4baa8efd43d"/><file name="Mage_Cron.csv" hash="886ff9a972aace0212e99eaffc92e626"/><file name="Mage_Customer.csv" hash="f6667ae628546da8b0dbba7c9511e7ed"/><file name="Mage_Dataflow.csv" hash="39fa74dda9fc3c0d090cbf9603c9bf40"/><file name="Mage_Directory.csv" hash="e9cb6f828c742074e09dca8b71aa59ef"/><file name="Mage_Downloadable.csv" hash="811fcbceeeeb857a094301682ddeb75e"/><file name="Mage_Eav.csv" hash="7d4f1eba659b9f4aa353e29c5bd7764d"/><file name="Mage_GiftMessage.csv" hash="7e67513bfe4575f280a92e4c62dc7406"/><file name="Mage_GoogleAnalytics.csv" hash="8a3813e578283e2696f857515af5e3bc"/><file name="Mage_GoogleBase.csv" hash="a298f45d618af0513decff9e4a2fb5a2"/><file name="Mage_GoogleCheckout.csv" hash="0d4baec9fa33a46c71bfbc2297311041"/><file name="Mage_GoogleOptimizer.csv" hash="6936fbce61b8b98f4db9f6a96cfd928c"/><file name="Mage_ImportExport.csv" hash="07c6f4de581be225df6c2c0e92dd7067"/><file name="Mage_Index.csv" hash="26ff84200b1e1c9635214aa10997e369"/><file name="Mage_Install.csv" hash="28b32cc3c27ebb82463104943e9d4916"/><file name="Mage_Log.csv" hash="671884c4618da93ca90d2d92404b6247"/><file name="Mage_Media.csv" hash="234187a0e1b83a03cb911452a4637357"/><file name="Mage_Newsletter.csv" hash="be1cf844ec1979d312bf828044aadd05"/><file name="Mage_Page.csv" hash="55dc27e882e054ab5bb1de0a7508c430"/><file name="Mage_PageCache.csv" hash="4bd38621bb26a02a15251fcb37e1408b"/><file name="Mage_Paygate.csv" hash="85ab720b4ab886e114109c4700152fb6"/><file name="Mage_Payment.csv" hash="8a79f00a42c0dee77515391bae1ab83a"/><file name="Mage_Paypal.csv" hash="25ce1dd8330d55f5e4cd535786b1baeb"/><file name="Mage_PaypalUk.csv" hash="3b4144cd1531dfbdaacab0003a33b534"/><file name="Mage_Poll.csv" hash="01084dbcb43b1da9de35c5730fabd692"/><file name="Mage_ProductAlert.csv" hash="8ceb95248eeb2e4611d01767a7331840"/><file name="Mage_Rating.csv" hash="c2b07462aa3200bc0a1bb7736dab958e"/><file name="Mage_Reports.csv" hash="f329610cfa01da616d6553b680c4c252"/><file name="Mage_Review.csv" hash="cfa497f4f74dd5ce7a8d79f94760fcd6"/><file name="Mage_Rss.csv" hash="462646b118596bd5a746845dd551561c"/><file name="Mage_Rule.csv" hash="193158c6c3d9bde69b93a459f7365875"/><file name="Mage_Sales.csv" hash="aff45266d5e513e9c6692ca5c8d39d60"/><file name="Mage_SalesRule.csv" hash="576d21ac0b1439881e0e68a4a40344ed"/><file name="Mage_Sendfriend.csv" hash="b1e310cf2fdaf674de1e7604826146e9"/><file name="Mage_Shipping.csv" hash="0b142a9adbf6e69b4cb88d0e21cf69fc"/><file name="Mage_Sitemap.csv" hash="4837691c0e5c8cfbc4d75b10f196eb65"/><file name="Mage_Tag.csv" hash="839398111326a3ba40325978d0c0503c"/><file name="Mage_Tax.csv" hash="26e31e83daa23da725597c73fe72d7df"/><file name="Mage_Usa.csv" hash="a119200cb27c856b0a27e8286fed2fb6"/><file name="Mage_Weee.csv" hash="770affc083d91a69a358ae27d176763d"/><file name="Mage_Widget.csv" hash="ea1e0f648413a3faa977bea3144f998d"/><file name="Mage_Wishlist.csv" hash="b7fc9ff33177dcb54f2e56d92b937351"/><dir name="template"><dir name="email"><file name="account_new.html" hash="4966aa588ca732356891f590b3b0575d"/><file name="account_new_confirmation.html" hash="12a285b863a6b50391748dec10194f2b"/><file name="account_new_confirmed.html" hash="7d7fdce80f125a36b10131ea5fda1e8c"/><file name="admin_password_new.html" hash="926124d24bc55687843df8bb13c45632"/><file name="contact_form.html" hash="e04255e76e6e2d35f40d90ec5571d7e1"/><file name="currency_update_warning.html" hash="f6a4e8139468995c6561a12cd6cff860"/><file name="log_clean_warning.html" hash="0bd6a39803f8aa2eb46d6c110d8d0056"/><file name="newsletter_subscr_confirm.html" hash="4632d5f485e54d275ca17d65b50b1647"/><file name="newsletter_subscr_success.html" hash="9179d85d345e2f2f48c13dd2578ddedd"/><file name="newsletter_unsub_success.html" hash="62704732a3ac8d6972949e17ee02ec79"/><file name="password_new.html" hash="9ce48b9d0e4d07ef5307793f88a41c0c"/><file name="payment_failed.html" hash="c9b8cefda13ccc2909d570694052b4c7"/><file name="product_alert_cron_error.html" hash="edd49272b0b793941cd7138b253ae1b1"/><file name="product_price_alert.html" hash="4e881231e7e4acc729f3a74d7a29b6a8"/><file name="product_share.html" hash="806247d32fe9a818a25ad6b5640502c2"/><file name="product_stock_alert.html" hash="1d90357122b3a4a86b17ae006b7993df"/><dir name="sales"><file name="creditmemo_new.html" hash="e1c88274790be02b7402fe3b7add841d"/><file name="creditmemo_new_guest.html" hash="dbf1499170eed75431ad413217711929"/><file name="creditmemo_update.html" hash="ef310fa46f1047bb8f91d83f62d6747f"/><file name="creditmemo_update_guest.html" hash="451a69970c3c12626a3e752787fa17d3"/><file name="invoice_new.html" hash="9f0972aab3072588f42a5bb319cfefb2"/><file name="invoice_new_guest.html" hash="3bb3f21e21372f81cb05d0747f7d316e"/><file name="invoice_update.html" hash="6e17efdf453d70a0000a39d8da682c84"/><file name="invoice_update_guest.html" hash="1bbdf348d0f87d3a9eadddfbf46380ac"/><file name="order_new.html" hash="b0cf6add92950aa4b2ddda321e2133d7"/><file name="order_new_guest.html" hash="84bc9564b98624c360f9575297d5082e"/><file name="order_update.html" hash="96de36f34847298b342dd621d48d40e9"/><file name="order_update_guest.html" hash="e823897ec4ffca2ccb923ef8f292d950"/><file name="shipment_new.html" hash="6c342ce76aa0ef2fc19922898eabce67"/><file name="shipment_new_guest.html" hash="d9337761a54420346390f5ba2e1fe318"/><file name="shipment_update.html" hash="53958f04f40ecf050e4b1a4014291188"/><file name="shipment_update_guest.html" hash="1966290ac5751ea42ec9993d79138143"/></dir><file name="sitemap_generate_warning.html" hash="d9c1ebf086e2f12dac31b18ab964daaa"/><file name="wishlist_share.html" hash="f0ca806eeb933ef02fcedfe20a69bf47"/></dir></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
-</package>
diff --git a/var/package/Magento_Mobile-1.4.2.0.xml b/var/package/Magento_Mobile-1.4.2.0.xml
deleted file mode 100644
index 60b9f7f9bf..0000000000
--- a/var/package/Magento_Mobile-1.4.2.0.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Magento_Mobile</name>
-    <version>1.4.2.0</version>
-    <stability>stable</stability>
-    <license>mixed</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Magento Mobile Xml Interface</summary>
-    <description>An integration magento with mobile applications (e.g. iPhone, Android, iPad)</description>
-    <notes>1.4.2.0 version of package
-svn revision #84716</notes>
-    <authors><author><name>Magento Core Team</name><user>auto-converted</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2010-12-17</date>
-    <time>14:58:11</time>
-    <contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="xmlconnect"><dir name="design_default"><file name="accordion_open.png" hash="3717f4b4ba725701e2a0604129a3a815"/><file name="banner_1_2.png" hash="07ced972eea2ca8af4a7c1107cebe6e1"/><file name="smallIcon_1_6.png" hash="c1ce9e289eaf2c0504d502928693bd89"/></dir><dir name="mobile_preview"><dir name="custom_icons"><file name="account.png" hash="0498d73e47ed47179e5546dc15c17dc7"/><file name="actionsBg.jpg" hash="ee3db742cbec9a436ba46118c8a01303"/><file name="addToCart.png" hash="e33876648546e99d875ca92bd2cd78e9"/><file name="addToWishlist.png" hash="1018602b7c5e0e11f0427ace96fd7d52"/><file name="background.gif" hash="bd92833eb2eb32e4a0282cea153ac13f"/><file name="buttons.gif" hash="0cd19a9d9178976906161ea100cba958"/><file name="cart.png" hash="815b4c64fae21b4c162525ece76dc44d"/><file name="home.png" hash="9e473791b022b7c2dfc7d29b1b6de887"/><file name="image-bg.png" hash="14bde5cf8b00dc5f6c60e52a0fa964dc"/><file name="logo-small.png" hash="9b3477a4552bcb878b4943aae5351622"/><file name="rowBgIcon.gif" hash="9ee89b961ae2bb047672ba5d2d2677c6"/><file name="search.png" hash="10bfa7ec3361ce7cbcc5d25087f181eb"/><file name="shop.png" hash="e6639a9fdc143363da82a7d78e126f1c"/><file name="star-active.png" hash="d4ab959a92bda610527a3e3942c4c0b0"/><file name="star-inactive.png" hash="f7fb99710be4c03ac23b1206f20e761d"/><file name="tellAFriend.png" hash="46f8ef48b29f245977d66d9312d87e70"/><file name="viewDetails.png" hash="9bacc63bcc483d3db5614a026d9391f6"/><file name="viewGallery.png" hash="304f3d03949d07055bc056359fe17763"/></dir><dir name="gradients"><file name="footer.png" hash="31a2feed50ef9c8637b412c4211f8300"/><file name="header.png" hash="5386da930a944cd75562216249cce08a"/><file name="header2.png" hash="ad5a2dc6ec93914e925cfe2d43fb30a2"/><file name="header3.png" hash="920ad8c6903e90323a57fb02dca37280"/><file name="item-bg.png" hash="a14886d1f9e14284ac6b4f1b61e68646"/><file name="sort-bg.png" hash="b8053bb772e849909e5b87e4fd1ebbe4"/></dir><dir name="icons"><file name="account.png" hash="0498d73e47ed47179e5546dc15c17dc7"/><file name="cart.png" hash="815b4c64fae21b4c162525ece76dc44d"/><file name="home.png" hash="9e473791b022b7c2dfc7d29b1b6de887"/><file name="more.png" hash="f3662ae29923b87eba3a729192aa3df3"/><file name="page.png" hash="2291d77f21de042040bc0864be40138b"/><file name="search.png" hash="10bfa7ec3361ce7cbcc5d25087f181eb"/><file name="shop.png" hash="e6639a9fdc143363da82a7d78e126f1c"/></dir><dir name="slider"><file name="actionsBg.jpg" hash="ee3db742cbec9a436ba46118c8a01303"/><file name="addToCart.png" hash="2a146be4bc63713df19cc353e030d44f"/><file name="addToWishlist.png" hash="9b23a4e0d9acfc79f314e9082f14c4de"/><file name="tellAFriend.png" hash="b7600fa2ae52bdb1d6bb86fe4d9f1773"/><file name="viewDetails.png" hash="90cf37c6dbbee1861350b4c05469e3ae"/><file name="viewGallery.png" hash="304f3d03949d07055bc056359fe17763"/></dir><dir name="sort_buttons"><file name="buttons.gif" hash="2f14f1a3f0fb38790779c992a58654ae"/><file name="buttons.png" hash="b4a3f17370e03bf5d2a5cdf7800c25a7"/><file name="center-active.png" hash="5903988cd458cd794f23a212d51aa725"/><file name="center-inactive.png" hash="135b46aaa5c3b131a5a7e9c45c004e06"/><file name="left-active.png" hash="86e94441b96a0d27d0b0a7e5108f86ed"/><file name="left-inactive.png" hash="0ddcb75aa9971cca39a5a65b4bdff8c4"/><file name="right-active.png" hash="320740ff608187301b06a96eab2f9e8e"/><file name="right-inactive.png" hash="cac4b39ab380353ffd5fdbcedb6e0a0a"/></dir><file name="1.gif" hash="817fd84187db3eee00799b0acf316457"/><file name="2.gif" hash="1a842d8f3ac25cfcdeab6c86dd8fea89"/><file name="3.gif" hash="207cd55e968c284bd52c86efdcdda1c7"/><file name="actionsBackground.png" hash="11faa8baee72f3e6a9a02a83915c8658"/><file name="actionsBg.png" hash="9acccd1980f17006942d74a718ebd7da"/><file name="arrow.png" hash="ad888276bd898ee95bedb44d0482a84c"/><file name="background.gif" hash="bd92833eb2eb32e4a0282cea153ac13f"/><file name="banner.png" hash="0637d31df6b5a434c9a332ee46122ef4"/><file name="btn-l.png" hash="92b2454528e9d39119038777cf53329c"/><file name="btn-r.png" hash="8c6aa9fd9203bc10822e0505f11e0c4d"/><file name="buttons.php" hash="a04839d41cf73d4c70b498ec75ff2bd4"/><file name="circle.png" hash="f4c116cb0554bf936d3b9ee38b7f3d1f"/><file name="grid.png" hash="23faa3f5572cdeb597c2bceedd93a7f8"/><file name="image-bg.png" hash="a588b9cced95a25fc18e28c775d9a001"/><file name="imageFrame.php" hash="f5a1298dfc6cb70cb486b55820f5ab21"/><file name="info.png" hash="3f0d2ed85b81e8251f294457c6bfa404"/><file name="lightStar.php" hash="cba0a7c5f28a1bbc764761f4fc581fe3"/><file name="lightStar.png" hash="b5dc40d5b793dae6a069357f49cccc24"/><file name="lightStar2.png" hash="75928926a6112540c9cb073157cb7d95"/><file name="lines-h.png" hash="ea3d95812c9838affc6df2f3a3cb1977"/><file name="lines-v.png" hash="9e3ffee29ba28477d50da9642019bc0a"/><file name="login-btn-left-alt.png" hash="71bb6c7d24252aace27bee711d7616f4"/><file name="login-btn-left.png" hash="cbbf9afc6e9fc433f57270e88b63f351"/><file name="login-btn-right.png" hash="438fcc598d012bf6d33184e95accfd24"/><file name="login-btn.png" hash="051ee2c1a8ce3f7b8de3293cd2e2ed85"/><file name="logo-small.png" hash="9b3477a4552bcb878b4943aae5351622"/><file name="logo_25.png" hash="ba41ed568d916175c32803b614442447"/><file name="men.png" hash="46d7d1773118ef0a27353e8a9f6719fe"/><file name="mm-frame.gif" hash="c8c9075532dfcec190e1e66d90af6e32"/><file name="mobile-catalog.css" hash="80cbd74984354df2d86f4ad68b9123a3"/><file name="mobile-home.css" hash="b57641c73c4eae08e0a02cd7291d9465"/><file name="rowBgIcon.gif" hash="9ee89b961ae2bb047672ba5d2d2677c6"/><file name="slider.gif" hash="c6b87bf15b85b18c0515e2cbefaabe60"/><file name="smallIcon.png" hash="e76d2a6364042f41b3f35fc8cdc9c0ee"/><file name="star-active.png" hash="d4ab959a92bda610527a3e3942c4c0b0"/><file name="star-inactive.png" hash="f7fb99710be4c03ac23b1206f20e761d"/><file name="t-shirt.gif" hash="7505efdaabf13c4f8e26f7cfe15c8c96"/><file name="t-shirt.png" hash="46d7d1773118ef0a27353e8a9f6719fe"/><file name="women.png" hash="46d7d1773118ef0a27353e8a9f6719fe"/><file name="youth.png" hash="46d7d1773118ef0a27353e8a9f6719fe"/></dir><file name="dropdown-arrow.gif" hash="332e99ca6b4d1e0d39972e04fb0b2395"/><file name="empty.png" hash="23dc9dc3c4751f83c2df7a5c42668824"/><file name="full-arrow.gif" hash="36ddff0fca1c7d8900cb3633e0a30cea"/><file name="gel_green.png" hash="591959d831e8e42c9175d12a88f0bae2"/><file name="gel_red.png" hash="db442c023014df9da32b84bc1bb5a39f"/><file name="l-arrow.gif" hash="ee49f7eab64657b5131953acef0238fd"/><file name="r-arrow.gif" hash="d0429a9781e915fc9d9ca8875c470d32"/><file name="small_logo.gif" hash="d5c8be7c0f16aac2549759c0228492d6"/><file name="swatch_black.gif" hash="fd31d6a3a435c8ad1f7c43f346bb47e4"/><file name="swatch_custom.gif" hash="fb34791a48366957a141e12b563888c2"/><file name="swatch_default.gif" hash="fb34791a48366957a141e12b563888c2"/><file name="swatch_funk_leaf.gif" hash="f1d3ba87efb742b47da879a6f48909c4"/><file name="swatch_hot_red.gif" hash="d9363d45dc2993c2fdc3ea43c5b6f71c"/><file name="swatch_sky_blue.gif" hash="ded1455db119d09a3aedd7474fd1875a"/><file name="switch-arrow.gif" hash="dc7243962b341f366cd072d486687e6a"/><file name="tab_account.png" hash="27101fbaa78a07426be4768acc4c53ff"/><file name="tab_cart.png" hash="e803f760ee81cb35183f1122f388b774"/><file name="tab_empty.png" hash="bdd4cc355566e8861b2c45424ad94516"/><file name="tab_home.png" hash="dfa104e4da74e4a55d3c98d6ee0f7122"/><file name="tab_more.png" hash="2803359cb3e795bf67457e727aa16020"/><file name="tab_page.png" hash="ca05dbc42f944b8d4255f6675f6dd93a"/><file name="tab_search.png" hash="2cf29dbe325558353621b4241543204f"/><file name="tab_shop.png" hash="f36be0d3d27f2b37626247d3f6a55e2a"/><file name="tmp-icon.gif" hash="58b759aecf3bdae26d5aaff7a0be5c90"/><file name="xmlconnect_tab.png" hash="cd99a7e01a42a6c82d866f7684faeb95"/></dir></dir><dir name="xmlconnect"><file name="boxes.css" hash="179bcab1f4e72c4520aed512e25d52dd"/><file name="dropdown.css" hash="e5388a1fd90df2a2e3860516adef0367"/><file name="mobile-catalog.css" hash="d25e18056f7b2052591df2b78f85c029"/><file name="mobile-home.css" hash="3920aff854809760e2fdfbbe8fd83c82"/><file name="styles.css" hash="bbd60ea124e519642590d673aaac019e"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="xmlconnect"><dir name="catalog"><dir name="category"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><file name="tab_account.png" hash="0498d73e47ed47179e5546dc15c17dc7"/><file name="tab_cart.png" hash="9055ba76e256a51d3fee53a8c41d5226"/><file name="tab_home.png" hash="07d0af93e167b9366d3d4fb3d6cdb31c"/><file name="tab_more.png" hash="b9fc21feb8d7655bc9c2985c37b0de2f"/><file name="tab_page.png" hash="ca05dbc42f944b8d4255f6675f6dd93a"/><file name="tab_search.png" hash="25e880eb2a4d06828e2e1c3f32d22400"/><file name="tab_shop.png" hash="fe602fc2e7093efef5ecc0b027a32d91"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="xmlconnect.xml" hash="256dd08353669333c1be8429632e4d0f"/></dir><dir name="template"><dir name="xmlconnect"><dir name="edit"><dir name="tab"><dir name="design"><dir name="preview"><file name="catalog.phtml" hash="10209c2112e521620c9a15f158c9eafd"/><file name="home.phtml" hash="460bbb33053cef36d22f8ddff37db22f"/><file name="tab_items.phtml" hash="f378d8ee6885abea2a45ae37ba68cf31"/></dir><file name="preview.phtml" hash="1316b1a3593b7937444563ccd6d4b9ab"/></dir><file name="design.phtml" hash="8667e1ec3686ea3df3a694fc259310f9"/></dir></dir><dir name="form"><dir name="element"><file name="addrow.phtml" hash="a61552d333f9c7f0fc46e3a2ab2ac7da"/><file name="app_tabs.phtml" hash="54c60769200d6aa12ba34dead37ca7b6"/><file name="themes.phtml" hash="9ee7e654897aa8d00a7676cb601bfd14"/></dir></dir><dir name="submission"><file name="app_icons_preview.phtml" hash="d1d5506593bb9555d2b77d558cf18e3c"/><file name="container.phtml" hash="c576009dd87ddd55ce8b023587128806"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="xmlconnect.xml" hash="e049c6909a3f6ce0bd9ebc1bfb61164a"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Mage_XmlConnect.csv" hash="29db96ab0fe9b5ec94dac6542a3ab618"/></dir></target><target name="mageweb"><dir name="js"><dir name="jscolor"><file name="arrow.gif" hash="5034704a76cd55c1cbcbc58ea6bf523f"/><file name="cross.gif" hash="ba9a274b9323753cd95bc3b1eb2f4e5f"/><file name="demo.html" hash="edf71251cb2be20322d2efb00aee86a6"/><file name="hs.png" hash="fefa1a03d92ebad25c88dca94a0b63db"/><file name="hv.png" hash="990d71cada17da100653636cf8490884"/><file name="jscolor.js" hash="b65a1505390592ac6c0177d6b84774e0"/></dir></dir></target><target name="magecore"><dir name="Mage"><dir name="XmlConnect"><dir name="Block"><dir name="Adminhtml"><dir name="History"><file name="Grid.php" hash="ca1be483da97539b1107d3337b7aaef8"/></dir><dir name="Mobile"><dir name="Edit"><dir name="Tab"><dir name="Design"><dir name="Accordion"><file name="Images.php" hash="1e8f1c61fee5844b6a2cccaeaeea2026"/><file name="Tabs.php" hash="d87af377fc0502d0c013e88a0ad9d23f"/><file name="Themes.php" hash="3b4b346088a62cd7a2e54e82dab8c298"/></dir><file name="Accordion.php" hash="239d481f16339c72ca19d648838729ea"/><file name="Preview.php" hash="e1fc2ea044a387f36fc9a3217b4ce950"/><file name="Themes.php" hash="4c7ca24ef525c3d65d73856ce276184a"/></dir><dir name="Submission"><file name="History.php" hash="468ca6a796b2e46a16c207f0275a7dd4"/></dir><file name="Content.php" hash="72ab7ed2a6414db98f57b13cc230f1dd"/><file name="Design.php" hash="01a1989615f3735cbe8c391a8cc43425"/><file name="General.php" hash="086f9f192a6b62dfeed241e4e1b11866"/><file name="Payment.php" hash="64afa1b7f7ddea8a88b231247f243cbd"/></dir><file name="Form.php" hash="70ce64cb067d9e7db22baa4461fb94a4"/><file name="Submission.php" hash="59009b5766b44f93c782e1675190b792"/><file name="Tabs.php" hash="b3caed0061272f6eab7785cd5f694a44"/></dir><dir name="Form"><dir name="Element"><file name="Addrow.php" hash="3d81d43f315c4945deb7dc5d1e178ce9"/><file name="Color.php" hash="6f76bdbfc72e95a7d758c7c0c17253e2"/><file name="Font.php" hash="4f73dc35e8dcddf6f1d3f793114ec42f"/><file name="Image.php" hash="abbf6430dac94a37ea2fee5b8d6fb4ae"/><file name="Page.php" hash="592d61ea89171ff3f8c2501e81244969"/><file name="Tabs.php" hash="1a98eaf5b85e2e651b70a7f53287b44a"/><file name="Theme.php" hash="ef055a8ad410086d117a1d23f9fd2466"/></dir></dir><dir name="Grid"><dir name="Renderer"><file name="Bool.php" hash="e88be0f2481bd6d0b6602a53242342a3"/><file name="Type.php" hash="2db5251142022d9f7e9038a4130a83fe"/></dir></dir><dir name="Preview"><file name="Content.php" hash="cc720332915678eaacb9e92e65d3e0a1"/><file name="Tabitems.php" hash="30d1304e13f657965f52b8bf7ab58167"/></dir><dir name="Submission"><dir name="Tab"><dir name="Container"><file name="Submission.php" hash="101756a7504dbf600da2855ac98297ce"/></dir><file name="Container.php" hash="b6756dcd3d31bbb7ac956dd8afaeb554"/></dir><file name="Form.php" hash="0c776b80edd1bec9b10ed86394f9a174"/><file name="Tabs.php" hash="eb8d04a6cbf6bd87b393b88ccdfc6ab7"/></dir><dir name="Widget"><file name="Form.php" hash="c488ce5a62e51c2883c59d354dcf8fbc"/></dir><file name="Edit.php" hash="a32c2e55e8a1d4b49abcc8e87308824f"/><file name="Grid.php" hash="0be6dd64b8d18181c4a9069f349c12d3"/><file name="Submission.php" hash="dd50ef9a2c309395f28e02acfa042fbb"/></dir><file name="History.php" hash="6473f46bfb07abd93c8fce3091eb9e73"/><file name="Mobile.php" hash="0b3b6831a52e814d9e7b396236be78cf"/></dir><dir name="Cart"><dir name="Paypal"><dir name="Mep"><file name="Totals.php" hash="bbba07df18c2129a52412354cddc7cfd"/></dir></dir><file name="Crosssell.php" hash="27c1a7689a733a5f0a6a6df270ee632f"/><file name="Info.php" hash="ef71a641f6b055e53ceb2d3dd2233161"/><file name="Totals.php" hash="b0efb2d9213afa227cd4853d590a9929"/></dir><dir name="Catalog"><dir name="Category"><file name="Info.php" hash="3f3451e9e54aadf1a79b97637739f732"/></dir><dir name="Product"><dir name="Options"><file name="Bundle.php" hash="588dfd04706e2a65d52997a414c08e19"/><file name="Configurable.php" hash="ea9caa4e6c748cf552ec7987bcb71e94"/><file name="Grouped.php" hash="1964d189f57542c39294291157a788b0"/><file name="Simple.php" hash="91c199fde9187222639aa0e4e9e60903"/><file name="Virtual.php" hash="544d90c5eff88c779b41d89385d8e6e0"/></dir><dir name="Price"><file name="Bundle.php" hash="024599da0aaf77428f4e46b2ad6dbab2"/><file name="Default.php" hash="b5954c71a12bd86bca787fbdca364d85"/></dir><dir name="Review"><file name="List.php" hash="069a9f0ecab5d824addab8f2147294eb"/></dir><file name="Attributes.php" hash="9dbcb5ff470d439ae11cba7605a7c3c3"/><file name="Gallery.php" hash="1b185d81cd2e0988a047bcb5b22d560b"/><file name="List.php" hash="6ccc800fb9d286706b1ad787393a0a4c"/><file name="Options.php" hash="b36f0545c759c40f0447c28f83c8aa75"/><file name="Price.php" hash="ed74e5139d3c4cdc25869b621945d4ce"/><file name="Related.php" hash="ac90464b63210737c08319b5495d57ad"/><file name="Review.php" hash="6554cc23d3e9c5181f235033cf48273e"/></dir><dir name="Search"><file name="Suggest.php" hash="f7f50152b6af55fbfdd351f3c9038495"/></dir><file name="Category.php" hash="029441cbf1151ad5a2b2d77d4280ce91"/><file name="Filters.php" hash="47b4f0255e2438fc16a783a9546ee6c9"/><file name="Product.php" hash="bd03e0800ba6bfdbe00f134daa057f70"/><file name="Search.php" hash="a02db3b9dcc5f1f0e5addcd5637d9026"/></dir><dir name="Checkout"><dir name="Address"><file name="Billing.php" hash="b74cd6f30c1c3502e0a911ee94aa79fc"/><file name="Form.php" hash="ef67b06d6c9548271db3f10737b21be0"/><file name="Shipping.php" hash="e45584832c9caa8550730d1d4a36dc4b"/></dir><dir name="Order"><dir name="Review"><file name="Info.php" hash="0c66606bde8b314b13774b7c22d3b570"/></dir><file name="Review.php" hash="37c6cfa6c313e1ba3bd2087076e6a682"/></dir><dir name="Payment"><dir name="Method"><dir name="Paypal"><file name="Direct.php" hash="6bd4bd8e138a9dd294cddf097cb4b84b"/><file name="Payflow.php" hash="d6629c6fa409e6d2c50183fdbf072e46"/></dir><file name="Authorizenet.php" hash="55b62355e0c84fbe8ed7b24db7d4ed22"/><file name="Ccsave.php" hash="b09dd8214c3f59924d44b1c6ad61aca0"/><file name="Checkmo.php" hash="b6d7be833728d961ac13264b495e5996"/><file name="List.php" hash="2793c1dca8d69bfd6a8061d33d5f97e5"/><file name="Purchaseorder.php" hash="7cac39f146f700dc17c455e7e9d291cd"/></dir></dir><dir name="Shipping"><dir name="Method"><file name="Avaliable.php" hash="d245c14a463292b63474831f0544f0db"/></dir></dir><file name="Agreements.php" hash="d588b32dc8df01d9ff59038cedc10634"/></dir><dir name="Cms"><file name="Page.php" hash="a8edee163ab2ae5af2d002c497c5a6d7"/></dir><dir name="Customer"><dir name="Address"><file name="Form.php" hash="d64fbb83ac86e7fdfe863e49a832ed9a"/><file name="List.php" hash="d79794a56f1b5596fee6504f8e9d4673"/></dir><dir name="Order"><file name="List.php" hash="e29993b281cf1839852fdfc28b43df9e"/></dir><file name="Form.php" hash="4d6d61ff566715178d2ac711d5405e30"/></dir><file name="Cart.php" hash="b16e2563d1ae487311aa9808afd4070b"/><file name="Catalog.php" hash="da853b485f21c9391d66ca357570ebf0"/><file name="Configuration.php" hash="bce119a0b545cbd55c614f3bac97f432"/><file name="Home.php" hash="6ebbea52615b30697362b548993b8140"/><file name="Wishlist.php" hash="58f9b5a81b048ca02a5098438fad00b7"/></dir><dir name="Controller"><file name="Action.php" hash="b62e372ffe79eab16f525cd601539a00"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="MobileController.php" hash="9b90636d44c3f23aa8f682e5a42a2a58"/></dir><dir name="Paypal"><file name="MepController.php" hash="b2a016a64d99791682e9fbd3c853ad2a"/></dir><file name="CartController.php" hash="c10650fd583a102efbbb23f6856a72c4"/><file name="CatalogController.php" hash="2815f849114d095d5b1c3d90a054ec47"/><file name="CheckoutController.php" hash="9bb3e1ce487b31bada39542e9d06b95e"/><file name="CmsController.php" hash="01fbe99e1345e7943092f131c12bff5b"/><file name="ConfigurationController.php" hash="3618188be7218a08499a992a4eb89b5e"/><file name="CustomerController.php" hash="1099182e4f320c989b5d2e6cff57eaea"/><file name="IndexController.php" hash="db6fd551a596bdad0d892a6a49ed7a8a"/><file name="WishlistController.php" hash="ee21a85525531b542e54322161f523da"/></dir><dir name="etc"><dir name="themes"><file name="custom.xml" hash="ebc37a04ad963210dc3df1bebd7c6bb8"/><file name="default.xml" hash="0a11ece3f96bb0bf9e89243e5d73f47f"/><file name="funk_leaf.xml" hash="33d33ad974914802c69286c7906834db"/><file name="hot_red.xml" hash="886c60b993e54346649845afe9948762"/><file name="sky_blue.xml" hash="7445b915e7ca4f2a58c992785e9cf64a"/></dir><file name="adminhtml.xml" hash="4d2ecb086a970a198c2ca6642f50af0e"/><file name="config.xml" hash="530826077e6eeac8c5ca5136752dd6c3"/><file name="system.xml" hash="80757938843effdfc7c776f95abda8a8"/></dir><dir name="Helper"><dir name="Catalog"><dir name="Category"><file name="Image.php" hash="c92e9a69bce91718bbee78f1a0f8e2b8"/></dir></dir><file name="Data.php" hash="1e536e0bd621189005d4b7a1f343f444"/><file name="Image.php" hash="ac9296a97792952ec4072b1ca3790b8e"/><file name="Iphone.php" hash="a4bba9639bf96e8d406bb82001801116"/><file name="Payment.php" hash="29a681773780e3120626d474465c0fb3"/><file name="Theme.php" hash="c5f61d94c798b5c611a49d48e1bd1a73"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Currency"><file name="Default.php" hash="3ab9d2cccf70f1365d9b2aa824c71c37"/></dir><file name="Baseurl.php" hash="63420d9737858478ad19b88cd38101b0"/></dir></dir></dir></dir><dir name="Catalog"><dir name="Category"><dir name="Media"><file name="Config.php" hash="976d85373a069c6742431b7b7af1093e"/></dir><file name="Image.php" hash="9b9eb931f50e4472fc254f10a90a4fe9"/></dir></dir><dir name="Mysql4"><dir name="Application"><file name="Collection.php" hash="2953b4c38120174d62a552b8cf9cc321"/></dir><dir name="Category"><file name="Collection.php" hash="ad4eba9ae6dc3747c263b0b2f9999b1e"/></dir><dir name="Cms"><dir name="Page"><file name="Collection.php" hash="c811cc9dd70e7df008988295972f1b8a"/></dir></dir><dir name="Filter"><file name="Collection.php" hash="6a55ee760159b77adb6fcdb5ad3c1f7f"/></dir><dir name="History"><file name="Collection.php" hash="537e132aef7e4275a43c1061f9c180cf"/></dir><file name="Application.php" hash="c907bde6b644276d6735c67d009eb944"/><file name="History.php" hash="e98c82ff7e42bbbfc5a2bfd97f1aeba8"/><file name="Setup.php" hash="cd7c56fb9a87d2bf3d69c4802692b671"/></dir><dir name="Payment"><dir name="Method"><dir name="Paypal"><file name="Mep.php" hash="4f243f8ba70b72ebd3d64137b150864c"/></dir></dir></dir><dir name="Paypal"><dir name="Mep"><file name="Checkout.php" hash="84c769a72d6e89c3dd80b48df560344b"/></dir></dir><dir name="Simplexml"><file name="Element.php" hash="553d73df9e0ce2e2ebcb141d677ca01b"/></dir><file name="Application.php" hash="7897fb9ec78aef995b16f49c813fb42d"/><file name="History.php" hash="bdc5a29045812b75221be99c1018d4ce"/><file name="Observer.php" hash="2087aa2b771d6bda29dbb717146c1221"/><file name="Tabs.php" hash="65db6ccb8baf8f7185fc5344961103cc"/><file name="Theme.php" hash="a56a9234917b334d835123bc03eaf9dc"/></dir><dir name="sql"><dir name="xmlconnect_setup"><file name="mysql4-install-1.4.0.8.php" hash="48bf0d6b291e579788ecbc7ae814a2a2"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_XmlConnect.xml" hash="f57b14eccad90152c221e4f090a8801b"/></dir></target><target name="magemedia"><dir name="xmlconnect"><dir name="custom"><file name="ok.gif" hash="398f81b3983f802a99932eaf97ee0806"/></dir><dir name="original"><file name="ok.gif" hash="398f81b3983f802a99932eaf97ee0806"/></dir><dir name="system"><file name="ok.gif" hash="398f81b3983f802a99932eaf97ee0806"/></dir><dir name="themes"><dir name="default"><file name="custom.xml" hash="210e8896d7b3b40c367a0c4971362e3c"/><file name="default.xml" hash="1288d8ddc94c4333c61b09592ba3db09"/><file name="funk_leaf.xml" hash="e276f61264fd122279984895d63921c8"/><file name="hot_red.xml" hash="9b8bf7dfc09e0d814ecc7dad6de1c6ea"/><file name="sky_blue.xml" hash="423c0e9a20b33e6df3904b10ac3be3e0"/></dir><file name="custom.xml" hash="ebc37a04ad963210dc3df1bebd7c6bb8"/><file name="default.xml" hash="0a11ece3f96bb0bf9e89243e5d73f47f"/><file name="funk_leaf.xml" hash="33d33ad974914802c69286c7906834db"/><file name="hot_red.xml" hash="886c60b993e54346649845afe9948762"/><file name="sky_blue.xml" hash="7445b915e7ca4f2a58c992785e9cf64a"/></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.4.1.0</min><max>1.4.2.0</max></package></required></dependencies>
-</package>
diff --git a/var/package/Magento_Mobile-1.5.0.0.16.xml b/var/package/Magento_Mobile-1.5.0.0.16.xml
deleted file mode 100644
index 9df1bc7df7..0000000000
--- a/var/package/Magento_Mobile-1.5.0.0.16.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Magento_Mobile</name>
-    <version>1.5.0.0.16</version>
-    <stability>stable</stability>
-    <license>mixed</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Magento Mobile Xml Interface</summary>
-    <description>An integration Magento with mobile applications (e.g. iPhone, Android, iPad)</description>
-    <notes>1.5.0.0.16</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2011-02-08</date>
-    <time>18:01:49</time>
-    <contents><target name="magecore"><dir name="Mage"><dir name="XmlConnect"><dir><dir name="Block"><dir name="Adminhtml"><dir name="History"><file name="Grid.php" hash="d1d1269d13cd9ec74d3b677aae9b9eb6"/></dir><file name="History.php" hash="b73d0568a20ba7436ed185af60e5796a"/><dir name="Mobile"><dir name="Edit"><file name="Form.php" hash="7d2951a89283c9a156a55dce8d602d78"/><file name="Submission.php" hash="2d32c7ad0785ae664665db943ce3783e"/><dir name="Tab"><file name="Content.php" hash="de612794dcd40ca1b337b8907d2c8698"/><dir name="Design"><dir name="Accordion"><file name="Images.php" hash="5e700ec277c2d9deb0c47e2d857503c6"/><file name="Tabs.php" hash="196546eff0747e48e5a98e33c32e06ff"/><file name="Themes.php" hash="21bfea541a3dc924db4c2454099771a7"/></dir><file name="Accordion.php" hash="db7c221187a63676c6aaf503f7178930"/><file name="Preview.php" hash="761b92334c90beefc021b5739bee44d5"/><file name="Theme.php" hash="fcd50cd3b627d28657e8b062e9f18ccc"/><file name="Themes.php" hash="1fb14db5e1a37f10a9c683d39e1e7b92"/></dir><file name="Design.php" hash="8455868c4228e5843ad5df8d366d9adf"/><file name="Flurryanalytics.php" hash="274993b6e069a15628b2b4a21c1d8d66"/><file name="General.php" hash="f23b99bd3289be4b57820a41f8a19b23"/><file name="Notification.php" hash="9a7516a8717e34b8adf5f5af68b1491c"/><file name="Payment.php" hash="1478f14b92f484b3c2a5e850edb04cf5"/><file name="Settings.php" hash="37806aee636dbb45d0b5380ee4501801"/><dir name="Submission"><file name="History.php" hash="1a69fd6d5cc1e70f282e93f46e4d4508"/></dir></dir><file name="Tabs.php" hash="58a95607970fb81c0e0359dfdb1dfda3"/></dir><file name="Edit.php" hash="d0de5fc20de955d0c8ac2b56696ae441"/><dir name="Form"><dir name="Element"><file name="Addrow.php" hash="712aa09a75055a67c5eb8252164bed3b"/><file name="Color.php" hash="ea684e77bf0d31fe5edfa2d195decb52"/><file name="Datetime.php" hash="2899049181506bd92f070031af27d74a"/><file name="Font.php" hash="ea3aff7e22c856f62a52b83519219d03"/><file name="Image.php" hash="abbf6430dac94a37ea2fee5b8d6fb4ae"/><file name="Page.php" hash="2a25660a9317726e1c9f7141cff742cf"/><file name="Tabs.php" hash="5ddff75f5233860db385ce9ee16680e9"/><file name="Theme.php" hash="ef055a8ad410086d117a1d23f9fd2466"/></dir></dir><dir name="Grid"><dir name="Renderer"><file name="Bool.php" hash="7b1b73458a22fc25a47bb24fe1811a97"/><file name="Type.php" hash="092632f1a02f27bbcfa23fb4b5ce2c38"/></dir></dir><file name="Grid.php" hash="7575f78ed90baab1abbdd2ec76fb3195"/><dir name="Preview"><file name="Content.php" hash="ceb283505b0b224e9b8be10870a53c36"/><file name="Tabitems.php" hash="97e61ca01551ee1408aa31f6fd27fb41"/></dir><dir name="Submission"><file name="Form.php" hash="dbe1a5ad64d23531ee4172e08c6fb2c8"/><dir name="Tab"><dir name="Container"><file name="Submission.php" hash="4944afa66ec9d5ac5edddc8febc4a88c"/></dir><file name="Container.php" hash="4365697817583d45a982627bf0971fe2"/><file name="Submission.php" hash="a9860162b25ebb99d3eca536687938b8"/></dir><file name="Tabs.php" hash="082cb359f007fed0b83ca733bdea8990"/></dir><file name="Submission.php" hash="943961be1f1b003cebe7487aa8b8f642"/><dir name="Widget"><file name="Form.php" hash="c24d7f20aef5612e0302ac88bc38d0e8"/></dir></dir><file name="Mobile.php" hash="7c296a8eea71d895caa783f8d20c9208"/><dir name="Queue"><dir name="Edit"><file name="Form.php" hash="608d93160e8cf2a6b162440b263f4a6e"/></dir><file name="Edit.php" hash="577b07269188d1e28bf570d0b9fe0797"/><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="4893f4ed37369666ce41a077ad2f7e28"/><file name="Application.php" hash="a667caaee3ae8731cf116b47e41d5a45"/><file name="Id.php" hash="9ef2d247479f45c06b967898012d8e10"/><file name="Msgtitle.php" hash="5102d6ed0149f29aea81f723d4907a6d"/><file name="Pushtitle.php" hash="6d8765e3bf95a8c2888054a92afad6c6"/><file name="Status.php" hash="38e7dfbda08deba05455848a8cf3b68e"/><file name="Template.php" hash="f9c0952334ef606994394566f8ef562b"/></dir></dir><file name="Grid.php" hash="fa6d7f3b17c2907af2d4ca51a9865b60"/></dir><file name="Queue.php" hash="6ff00498f13bb0944c1c6412579305bc"/><dir name="Template"><dir name="Edit"><file name="Form.php" hash="f105b2e70f1a2fea7bcbc63b9803cff5"/></dir><file name="Edit.php" hash="2606ea670f758d0ac6019015a8f4538a"/><dir name="Grid"><dir name="Renderer"><file name="Application.php" hash="656731fd3255131dc2dcd978e74294ca"/></dir></dir><file name="Grid.php" hash="c05ac846b22c826220cc27133249a901"/><dir name="Preview"><file name="Form.php" hash="44b43aea7139700dd8fd88a7db94e709"/></dir><file name="Preview.php" hash="37539c206602c76f6a0540a157736f9f"/></dir><file name="Template.php" hash="5ca5da02fb64be481bbb120bae8c77d7"/></dir><dir name="Cart"><file name="Crosssell.php" hash="a003db593c31e31ba35dc8fa5f82dbd7"/><file name="Info.php" hash="ef71a641f6b055e53ceb2d3dd2233161"/><dir name="Paypal"><dir name="Mep"><file name="Totals.php" hash="d403bf2340454795d329a5ca24b2f572"/></dir></dir><file name="Totals.php" hash="837b978e39197e5655688092b7e21905"/></dir><file name="Cart.php" hash="40c7f2e09de4cedf717cfbe136a1bb6b"/><dir name="Catalog"><dir name="Category"><file name="Info.php" hash="dae82ca5c76fbb96fa20aa6c716ab8c5"/></dir><file name="Category.php" hash="3fcca31c03068f719c75afebaf727e3a"/><file name="Filters.php" hash="47b4f0255e2438fc16a783a9546ee6c9"/><dir name="Product"><file name="Attributes.php" hash="9be610e216a6a3d30cb66b1d7c425afa"/><file name="Gallery.php" hash="bf3984711ebf4d8815a2a4b745c544bd"/><file name="List.php" hash="b75b2ad8be808f5ca05664e3d6908273"/><dir name="Options"><file name="Bundle.php" hash="f7f53deb6e5c2476215d274bf0c9c8d4"/><file name="Configurable.php" hash="b95cb59a486dcf17b122ade0d00a75c3"/><file name="Grouped.php" hash="9d4e7547155203eb456bca064f921d28"/><file name="Simple.php" hash="2cd5fec2677881ab26c7955d3b4abf66"/><file name="Virtual.php" hash="3b65d117c5ffa35ff6532655268e9a3d"/></dir><file name="Options.php" hash="3ec83e9974c526f32dfd2c39e5d0f581"/><dir name="Price"><file name="Bundle.php" hash="fc2086aa910549a32b2d7cfe49d95ce4"/><file name="Default.php" hash="5b0ebe611661fac68b9ed7d43ea1fe0d"/></dir><file name="Price.php" hash="6bb5eb396313c1c090c975c9360bd5e3"/><file name="Related.php" hash="ac90464b63210737c08319b5495d57ad"/><dir name="Review"><file name="List.php" hash="c35a0b04554afbbd17224dce0a317627"/></dir><file name="Review.php" hash="95b6ca966d3effab6e493e0bfbe24f59"/></dir><file name="Product.php" hash="4e2254849151b499ac8d33fcaee697a7"/><dir name="Search"><file name="Suggest.php" hash="f7f50152b6af55fbfdd351f3c9038495"/></dir><file name="Search.php" hash="3336e36110dba7a2e6e0533d76fe37aa"/></dir><file name="Catalog.php" hash="cca60c6e50d405538a7edf81287b3c31"/><dir name="Checkout"><dir name="Address"><file name="Billing.php" hash="b74cd6f30c1c3502e0a911ee94aa79fc"/><file name="Form.php" hash="db5c8db9c73cd5da6dc1be1b55faf093"/><file name="Shipping.php" hash="e45584832c9caa8550730d1d4a36dc4b"/></dir><file name="Agreements.php" hash="e3dc0ab71f42882a068c786b55c239c1"/><dir name="Order"><dir name="Review"><file name="Info.php" hash="8ca970296f2a4949ece02b41942c81dd"/></dir><file name="Review.php" hash="37c6cfa6c313e1ba3bd2087076e6a682"/></dir><dir name="Payment"><dir name="Method"><file name="Authorizenet.php" hash="aec10335da7e6217e28080fa20f126f6"/><file name="Ccsave.php" hash="b09dd8214c3f59924d44b1c6ad61aca0"/><file name="Checkmo.php" hash="b6d7be833728d961ac13264b495e5996"/><file name="List.php" hash="6ddb44f7c627ed222fedda1c721a799e"/><dir name="Paypal"><file name="Direct.php" hash="6bd4bd8e138a9dd294cddf097cb4b84b"/><file name="Payflow.php" hash="538cd857e1e323b1edf28ecb6a4a1816"/></dir><file name="Purchaseorder.php" hash="7cac39f146f700dc17c455e7e9d291cd"/></dir></dir><dir name="Shipping"><dir name="Method"><file name="Avaliable.php" hash="a38b46935b7cead787c924aab63d6c64"/></dir></dir></dir><dir name="Cms"><file name="Page.php" hash="a8edee163ab2ae5af2d002c497c5a6d7"/></dir><file name="Configuration.php" hash="4497df39169462a9efbca0e14bdbcc83"/><dir name="Customer"><dir name="Address"><file name="Form.php" hash="de3a2865d1b3bf64e9bfb5d78e2ff188"/><file name="List.php" hash="8a8dc00983eca77a5c78f1c700a9320e"/></dir><file name="Form.php" hash="ebf187dec20442e91aecdf794c6a7969"/><dir name="Order"><file name="List.php" hash="a21dbd149b5e7605f79a8d3c2da2b008"/></dir></dir><file name="Home.php" hash="b8ebc37489f1be5b0f921dfa0c93d412"/><file name="Wishlist.php" hash="378f4fb82c32da5d47cdfacdfcf46596"/></dir><dir name="Controller"><file name="Action.php" hash="c7da05c7de4efb18e6ec858b592d6abe"/></dir><dir name="Helper"><file name="Android.php" hash="33366635c30a27e2c436cb8503b69213"/><dir name="Catalog"><dir name="Category"><file name="Image.php" hash="790d8be1b2cff4e38c85af9516a41077"/></dir></dir><file name="Data.php" hash="31b6e41f7a756ead9a110f229cabc409"/><file name="Image.php" hash="9a761c39d490361ff7bfbdad90d548d0"/><file name="Ipad.php" hash="716e6dfdd77aef401512d7b105d5808e"/><file name="Iphone.php" hash="f34ae584cf497e8a1198fa058edb6c60"/><file name="Payment.php" hash="8fbab7bb7dffdb669eef3d7c57cd5419"/><file name="Theme.php" hash="a54a8a77707ed0b4497e8fb3b3131992"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><file name="Baseurl.php" hash="9609ae98e99a8850698fbb25fe84a163"/><dir name="Currency"><file name="Default.php" hash="aece000db5ad760661471ebd7e1f6ecb"/></dir></dir></dir></dir></dir><file name="Application.php" hash="4c2b47066cce868e26c21527d8c8b065"/><dir name="Catalog"><dir name="Category"><file name="Image.php" hash="a2723c9ebe12f60e0c8df0a682476b95"/><dir name="Media"><file name="Config.php" hash="f0465e55e6ab922ae9de053d583d8390"/></dir></dir></dir><file name="History.php" hash="ad33e0c504ef6685b1377cd6baeb6598"/><dir name="Mysql4"><dir name="Application"><file name="Collection.php" hash="2be10e2eb68fd639fefaca00ab871707"/></dir><file name="Application.php" hash="358e3e1a35081fae553a2546b57d2996"/><dir name="Category"><file name="Collection.php" hash="addc3c962b05b8ca13996714e7f88404"/></dir><dir name="Cms"><dir name="Page"><file name="Collection.php" hash="096d160ee850caa72e432938ae2b40be"/></dir></dir><dir name="Filter"><file name="Collection.php" hash="c0c2b29d28e83e1558ff2a782c5c5ae1"/></dir><dir name="History"><file name="Collection.php" hash="51ad48285cdde01f4c72df81aab88a39"/></dir><file name="History.php" hash="7f98de19717b14af7f661eba1d0e7290"/><dir name="Queue"><file name="Collection.php" hash="4e9ddc30978a23485d4ebc0a82525981"/></dir><file name="Queue.php" hash="b2965b8e71ea9a552af0282259441ba8"/><file name="Setup.php" hash="cd7c56fb9a87d2bf3d69c4802692b671"/><dir name="Template"><file name="Collection.php" hash="b24088ed79ec2ae5e832e0c1ab7bfada"/></dir><file name="Template.php" hash="8c4b78bfd4869ec4424610f9a433e5e2"/></dir><file name="Observer.php" hash="18ff1ad929947adc2324ee5b208e6c27"/><dir name="Payment"><dir name="Method"><dir name="Paypal"><file name="Mep.php" hash="d5af849a02b7ee7bc2fc32f56f888b31"/></dir></dir></dir><dir name="Paypal"><dir name="Mep"><file name="Checkout.php" hash="29cda9ec19b5206dac79a75dc699dd33"/></dir></dir><file name="Queue.php" hash="d58fd6cb2df551c3afe269b5da81b48c"/><dir name="Simplexml"><file name="Element.php" hash="eed6ab702734392e3c25044ac582adbd"/></dir><file name="Tabs.php" hash="61a22da4403f5ee1d25176cedcc7177f"/><file name="Template.php" hash="ab1c5cda16bad55e4507ded2b3eab5e2"/><file name="Theme.php" hash="09e9070ad654adbdb306858888f3470d"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="MobileController.php" hash="88a3a352f79e2db6a77b3cee1eb05d9a"/></dir><file name="CartController.php" hash="08f88d7e136d1bd1aeeb0b739a0872f7"/><file name="CatalogController.php" hash="89762e13fc2b4b182babaf3bdb767e27"/><file name="CheckoutController.php" hash="5b246c0f847c99618477e6ed7812f2ff"/><file name="CmsController.php" hash="fa7b9137b968a0bbb8ca750a8cd8a906"/><file name="ConfigurationController.php" hash="30d65ee62d186ffa6a315cb41f7043b1"/><file name="CustomerController.php" hash="190398518b0f033f5287275a51ce5000"/><file name="IndexController.php" hash="68aadc30dee159e00d7ab261991702fd"/><dir name="Paypal"><file name="MepController.php" hash="a4abcf5ad1189104b2fe0c6f52bc50c7"/></dir><file name="WishlistController.php" hash="35d09da917068414c41617a71afa836b"/></dir><dir name="etc"><file name="adminhtml.xml" hash="33642773574f36356937e18a3043589f"/><file name="config.xml" hash="f4579b173ac1f52753f8379af083339b"/><file name="system.xml" hash="759fbe862cf96d79eca093de0dd68320"/><dir name="themes"><file name="custom.xml" hash="ebc37a04ad963210dc3df1bebd7c6bb8"/><file name="default.xml" hash="0a11ece3f96bb0bf9e89243e5d73f47f"/><file name="funk_leaf.xml" hash="33d33ad974914802c69286c7906834db"/><file name="hot_red.xml" hash="886c60b993e54346649845afe9948762"/><file name="sky_blue.xml" hash="7445b915e7ca4f2a58c992785e9cf64a"/></dir></dir><dir name="sql"><dir name="xmlconnect_setup"><file name="mysql4-install-1.4.0.8.php" hash="d722f3f741af029773ebaf514c522b0f"/><file name="mysql4-upgrade-1.4.0.10-1.4.0.11.php" hash="6639fd160ac9c1e9571803db430337e0"/><file name="mysql4-upgrade-1.4.0.11-1.4.0.12.php" hash="a1333a0c415cbc398cdd0671ab539102"/><file name="mysql4-upgrade-1.4.0.12-1.4.0.13.php" hash="a07f66c79bb1df1208c9000c3496ada1"/><file name="mysql4-upgrade-1.4.0.8-1.4.0.9.php" hash="7f6bc966e741f00c44919aa6d4307b8c"/><file name="mysql4-upgrade-1.4.0.9-1.4.0.10.php" hash="4b49d5535e48255c793acd3b73e9aaf8"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="xmlconnect.xml" hash="d2c2c5afad40aa674fbdee3bfc479ba3"/></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="xmlconnect.xml" hash="c1ee2defad7d56774bb455e64efd111b"/></dir><dir name="template"><dir name="xmlconnect"><dir><dir name="edit"><dir name="tab"><dir name="design"><dir name="preview"><file name="catalog.phtml" hash="81380a9e787592aa1605230ece020196"/><file name="catalog_android.phtml" hash="ef5d6fb5085282de3e1d39dfb4f4f88e"/><file name="catalog_hor_ipad.phtml" hash="4b7e9217c800159b22c2f55c9453b891"/><file name="catalog_ipad.phtml" hash="3189ca4d6f560a7adb3a182a5561a407"/><file name="home.phtml" hash="df8d63b0505c1dd4b54559e695c54d0a"/><file name="home_android.phtml" hash="62352c6284ef85c06129901c9f5b284f"/><file name="home_hor_ipad.phtml" hash="95154d0ea3a93b76e6b6580873756994"/><file name="home_ipad.phtml" hash="41535ffe0ebb9092e7b3a4304684e73c"/><file name="productinfo.phtml" hash="99586ded5afa81d479157e612e231019"/><file name="tab_items.phtml" hash="d762885692b8a890c7a2dd4408247c91"/><file name="tab_items_android.phtml" hash="a5046344734fb5fcca7c8d0cd1cbbe42"/><file name="tab_items_ipad.phtml" hash="397cdf898d97fa5c1af7609cca97e705"/></dir><file name="preview_android.phtml" hash="a635a81dd15ff73b8ff65bdc16708c0c"/><file name="preview_ipad.phtml" hash="99f5296eabd3f2e1eaf40c34c55f16da"/><file name="preview_iphone.phtml" hash="9f97e2d9c4ef64f0fb8e13e010b9f5e3"/></dir><file name="design.phtml" hash="5e5cb97a598d3b617351f02c1ba0a2d7"/></dir></dir><dir name="form"><dir name="element"><file name="addrow.phtml" hash="46fddf6c4b452a6c529499de2c2f1323"/><file name="app_tabs.phtml" hash="54c60769200d6aa12ba34dead37ca7b6"/><file name="app_tabs_android.phtml" hash="92df75ceecedd911eed98ae8703ac83a"/><file name="app_tabs_ipad.phtml" hash="774eec3831c2e25657d86f4fe037d73d"/><file name="app_tabs_iphone.phtml" hash="4936c1e64fe3da857b1108ab44a8598d"/><file name="themes.phtml" hash="d5fc4927d841572900e95be1af4f97ce"/></dir></dir><dir name="mobile"><file name="notification_helper.phtml" hash="7371199d70c36f2cc0d05b5756f9198f"/></dir><dir name="submission"><file name="app_icons_preview.phtml" hash="4d4f0f78338338d15605777df69be0e7"/><file name="container.phtml" hash="c576009dd87ddd55ce8b023587128806"/></dir><dir name="template"><file name="preview.phtml" hash="08ad6391829b888bdd2e0329dc672d06"/></dir></dir><file name="theme.phtml" hash="723fb7dd79252c2e66d3d584487b221e"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_XmlConnect.xml" hash="f57b14eccad90152c221e4f090a8801b"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Mage_XmlConnect.csv" hash="0e3418c2acbdbb7bebfc6061cf1bd13a"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="xmlconnect"><file name="boxes.css" hash="4914fcd64550eae6e4aca254d4ecbf84"/><file name="dropdown.css" hash="e5388a1fd90df2a2e3860516adef0367"/><dir><dir name="fonts"><file name="stars-webfont.eot" hash="019beb4b8ec19447657cf3106138bbe3"/><file name="stars-webfont.svg" hash="20cf0312c0b951d173d4531ea18abc6f"/><file name="stars-webfont.ttf" hash="d63d95e9adaf775f410437535622bf60"/><file name="stars-webfont.woff" hash="526d9756131c94139f0f1df5272197fd"/></dir></dir><file name="mobile-android.css" hash="3925093a1488ee72cff5e7be92d7c1cc"/><file name="mobile-catalog.css" hash="8343c0fcbf7fc86a28cd87e9b378df2f"/><file name="mobile-home.css" hash="940cf98c5dc96103a400ad85064b5616"/><file name="mobile-ipad-catalog.css" hash="eb60d2b4d6fe9ff2564f31f2eb724789"/><file name="mobile-ipad-home.css" hash="202368d240517e392a040f48612561e6"/><file name="styles.css" hash="bbd60ea124e519642590d673aaac019e"/></dir><dir name="images"><dir name="xmlconnect"><dir><dir name="design_default"><file name="accordion_open.png" hash="3717f4b4ba725701e2a0604129a3a815"/><file name="accordion_open_android.png" hash="7ef2f1d193990c3f4c2c90aae9ab3281"/><file name="accordion_open_android_l.png" hash="bc27688afbfd866c618477ea2c7bf0ee"/><file name="accordion_open_android_p.png" hash="2e4549cba575c12ef2a39c12e9ffe173"/><file name="accordion_open_ipad_l.png" hash="dcdda97da6556393b972d6dae8d6bac5"/><file name="accordion_open_ipad_p.png" hash="55cca08a0ab79047961858789ff8c3a7"/><file name="banner_1_2.png" hash="07ced972eea2ca8af4a7c1107cebe6e1"/><file name="banner_android.png" hash="02695661b8e50e1a001c3369622f322f"/><file name="banner_ipad.png" hash="c1d59a6ec67da1bb76c5142453da7acf"/><file name="smallIcon_1_6.png" hash="c1ce9e289eaf2c0504d502928693bd89"/></dir><dir name="mobile_preview"><file name="1.gif" hash="817fd84187db3eee00799b0acf316457"/><file name="2.gif" hash="1a842d8f3ac25cfcdeab6c86dd8fea89"/><file name="3.gif" hash="207cd55e968c284bd52c86efdcdda1c7"/><file name="actionsBackground.png" hash="11faa8baee72f3e6a9a02a83915c8658"/><file name="actionsBg.png" hash="9acccd1980f17006942d74a718ebd7da"/><dir name="android"><file name="background_home_landscape.jpg" hash="1f79a1f42ca4e2cf6010ab6c3ef66aa4"/><file name="background_portrait.jpg" hash="197b15e6455ad1a85e1bad6595371fa3"/><file name="bg_button_up.gif" hash="204f590a88933c930b7fc92963accfab"/><file name="bg_cat_item.png" hash="2859b45c387b66243d4af2ba973b2ae1"/><file name="bg_catalog_filters.png" hash="7464191ebaf576b73a3c021eb1cfcc25"/><file name="bg_catalog_filters_shadow.png" hash="5021ad60917190026d85fae1d33bdaa9"/><file name="bg_frame.gif" hash="7062ed9b7563fc658f49ce7cfdd34f1c"/><file name="bg_header.png" hash="d4a46c8850d1d89259921b1c28b5bce1"/><file name="bg_logo.png" hash="02695661b8e50e1a001c3369622f322f"/><file name="bg_page.png" hash="d65f1d123655c2eaf3bb4a1e6035a08d"/><file name="bg_star.png" hash="fc6de6c4e0ed3478b8840e1ab81da725"/><file name="bg_star_empty.png" hash="3f0421fb8c8f6c4be6ca501168a881e8"/><file name="bg_status_bar.png" hash="52b41106451ac34672f82338bbc5370c"/><file name="ico_account.png" hash="c1fd338c74fcf483155acbd37c430807"/><file name="ico_home.png" hash="2de37f640463b354d68945320bfe3e4f"/><file name="ico_search.png" hash="8b0dd17a3e9c3328e66204fe379c66aa"/><file name="product_image.png" hash="dd975b128ba303e0ae2adc9772e0433c"/><file name="product_image_1.jpg" hash="8994979d4dcc1f339c73cd1f44398a7d"/><file name="product_image_2.jpg" hash="26d6599bdb35d80b25a1e903b40cfa19"/><file name="product_image_3.jpg" hash="d7c6d05196a84341afe0025d01b9dc61"/><file name="product_image_4.jpg" hash="2a88ead3dbbeff1d40168db692841f2f"/></dir><file name="arrow.png" hash="837259a7c365e46034dca728bffe9070"/><file name="background.gif" hash="bd92833eb2eb32e4a0282cea153ac13f"/><file name="banner.png" hash="0637d31df6b5a434c9a332ee46122ef4"/><file name="btn-l.png" hash="92b2454528e9d39119038777cf53329c"/><file name="btn-r.png" hash="8c6aa9fd9203bc10822e0505f11e0c4d"/><file name="buttons.php" hash="a04839d41cf73d4c70b498ec75ff2bd4"/><file name="circle.png" hash="f4c116cb0554bf936d3b9ee38b7f3d1f"/><dir name="custom_icons"><file name="account.png" hash="0498d73e47ed47179e5546dc15c17dc7"/><file name="actionsBg.jpg" hash="ee3db742cbec9a436ba46118c8a01303"/><file name="addToCart.png" hash="e33876648546e99d875ca92bd2cd78e9"/><file name="addToWishlist.png" hash="1018602b7c5e0e11f0427ace96fd7d52"/><file name="background.gif" hash="bd92833eb2eb32e4a0282cea153ac13f"/><file name="buttons.gif" hash="0cd19a9d9178976906161ea100cba958"/><file name="cart.png" hash="815b4c64fae21b4c162525ece76dc44d"/><file name="home.png" hash="9e473791b022b7c2dfc7d29b1b6de887"/><file name="image-bg.png" hash="14bde5cf8b00dc5f6c60e52a0fa964dc"/><file name="logo-small.png" hash="9b3477a4552bcb878b4943aae5351622"/><file name="rowBgIcon.gif" hash="9ee89b961ae2bb047672ba5d2d2677c6"/><file name="search.png" hash="10bfa7ec3361ce7cbcc5d25087f181eb"/><file name="shop.png" hash="e6639a9fdc143363da82a7d78e126f1c"/><file name="star-active.png" hash="d4ab959a92bda610527a3e3942c4c0b0"/><file name="star-inactive.png" hash="f7fb99710be4c03ac23b1206f20e761d"/><file name="tellAFriend.png" hash="46f8ef48b29f245977d66d9312d87e70"/><file name="viewDetails.png" hash="9bacc63bcc483d3db5614a026d9391f6"/><file name="viewGallery.png" hash="304f3d03949d07055bc056359fe17763"/></dir><dir name="gradients"><file name="footer.png" hash="31a2feed50ef9c8637b412c4211f8300"/><file name="header.png" hash="5386da930a944cd75562216249cce08a"/><file name="header2.png" hash="ad5a2dc6ec93914e925cfe2d43fb30a2"/><file name="header3.png" hash="920ad8c6903e90323a57fb02dca37280"/><file name="item-bg.png" hash="a14886d1f9e14284ac6b4f1b61e68646"/><file name="sort-bg.png" hash="b8053bb772e849909e5b87e4fd1ebbe4"/></dir><file name="grid.png" hash="23faa3f5572cdeb597c2bceedd93a7f8"/><dir name="icons"><file name="account.png" hash="0498d73e47ed47179e5546dc15c17dc7"/><file name="cart.png" hash="815b4c64fae21b4c162525ece76dc44d"/><file name="home.png" hash="9e473791b022b7c2dfc7d29b1b6de887"/><file name="more.png" hash="f3662ae29923b87eba3a729192aa3df3"/><file name="page.png" hash="2291d77f21de042040bc0864be40138b"/><file name="search.png" hash="10bfa7ec3361ce7cbcc5d25087f181eb"/><file name="shop.png" hash="e6639a9fdc143363da82a7d78e126f1c"/></dir><file name="image-bg.png" hash="a588b9cced95a25fc18e28c775d9a001"/><file name="imageFrame.php" hash="f5a1298dfc6cb70cb486b55820f5ab21"/><file name="info.png" hash="3f0d2ed85b81e8251f294457c6bfa404"/><dir name="ipad"><file name="background_home_landscape.jpg" hash="9e3ef117985113b804531142d539b60a"/><file name="background_portrait.jpg" hash="bdf9e034fd30b923086e6c622ea10451"/><file name="banner_image.png" hash="693bb9d118155a146b21ce9fcfba08da"/><file name="bg_catalog_header_hor.png" hash="f61a67aa288e1b8a8df7b4d4527c662e"/><file name="bg_content.jpg" hash="70ddfc8959d878d1231dc7cbee4a063c"/><file name="bg_filter_button.png" hash="728f1cd358446881ffd863eff12204a1"/><file name="bg_filters_buttons.png" hash="02fcb0ed7a7268e9f64ebaf06235bc09"/><file name="bg_filters_tooltip.png" hash="3b05ca6e585acd3d766be01eeaa23d47"/><file name="bg_filters_wrap.png" hash="31288784fe95c67de9b45b44458b4155"/><file name="bg_header.png" hash="e2cf5a575a27e6e4533e3c85e3472a82"/><file name="bg_home_header.png" hash="00f2fbf96d2b915dcbcd921b0301ef3f"/><file name="bg_home_header_hor.png" hash="9bfef728ece003d5b3433d2623ea168c"/><file name="bg_home_products.png" hash="ac6a8a79b959a0c8298b1f607c0f0af8"/><file name="bg_home_shadow.png" hash="c54b071ca3e97a6ee67588ef74b7b44e"/><file name="bg_home_shadow_hor.png" hash="0d21a99c5c749d0e5070e3585ff4a23f"/><file name="bg_product_image.png" hash="4da74325c1a4ee1ca19b414e5d590f75"/><file name="bg_search.png" hash="6ee08d05d0c4ef9ed64b9914b821f408"/><file name="bg_sections.jpg" hash="0ee90005663aced09a9ce6385bdbce2c"/><file name="bg_status_bar.png" hash="17124d9d392bb8e37b202c80a595df54"/><file name="bg_status_bar_hor.png" hash="bd4a9f11ecb1c896145267731d8a951d"/><file name="i_cart.png" hash="1bbe0a0e54eed5bb14b9bfcce83da758"/><file name="i_info.png" hash="3f0fda8b294b67bf698badbcaa99150b"/><file name="i_login.png" hash="deb4089bdc61582c78c90ef192d577e8"/><file name="i_remove.png" hash="4923eb5e76b3c6ba6df5c667db816a0c"/><file name="logo.png" hash="49c19f59b459b6c0b3b99daa3fe7f932"/><file name="logo_big.png" hash="693bb9d118155a146b21ce9fcfba08da"/><file name="product_image.jpg" hash="2bb6c69129bcb18dc93e9f48605647c6"/><file name="sections_arrow.png" hash="7db7144083a31882e8a62cb9579f478f"/><file name="stars.png" hash="70d38cd9883d70e4f6b21ac4874b9868"/></dir><file name="lightStar.php" hash="cba0a7c5f28a1bbc764761f4fc581fe3"/><file name="lightStar.png" hash="b5dc40d5b793dae6a069357f49cccc24"/><file name="lightStar2.png" hash="75928926a6112540c9cb073157cb7d95"/><file name="lines-h.png" hash="ea3d95812c9838affc6df2f3a3cb1977"/><file name="lines-v.png" hash="9e3ffee29ba28477d50da9642019bc0a"/><file name="login-btn-left-alt.png" hash="71bb6c7d24252aace27bee711d7616f4"/><file name="login-btn-left.png" hash="cbbf9afc6e9fc433f57270e88b63f351"/><file name="login-btn-right.png" hash="438fcc598d012bf6d33184e95accfd24"/><file name="login-btn.png" hash="051ee2c1a8ce3f7b8de3293cd2e2ed85"/><file name="logo-small.png" hash="9b3477a4552bcb878b4943aae5351622"/><file name="logo_25.png" hash="ba41ed568d916175c32803b614442447"/><file name="men.png" hash="46d7d1773118ef0a27353e8a9f6719fe"/><file name="mm-frame.gif" hash="eebf30806f1dbf2118e7ec39a016c86d"/><file name="mobile-catalog.css" hash="80cbd74984354df2d86f4ad68b9123a3"/><file name="mobile-home.css" hash="b57641c73c4eae08e0a02cd7291d9465"/><file name="rowBgIcon.gif" hash="9ee89b961ae2bb047672ba5d2d2677c6"/><dir name="slider"><file name="actionsBg.jpg" hash="ee3db742cbec9a436ba46118c8a01303"/><file name="addToCart.png" hash="2a146be4bc63713df19cc353e030d44f"/><file name="addToWishlist.png" hash="9b23a4e0d9acfc79f314e9082f14c4de"/><file name="tellAFriend.png" hash="b7600fa2ae52bdb1d6bb86fe4d9f1773"/><file name="viewDetails.png" hash="90cf37c6dbbee1861350b4c05469e3ae"/><file name="viewGallery.png" hash="304f3d03949d07055bc056359fe17763"/></dir><file name="slider.gif" hash="c6b87bf15b85b18c0515e2cbefaabe60"/><file name="smallIcon.png" hash="e76d2a6364042f41b3f35fc8cdc9c0ee"/><dir name="sort_buttons"><file name="bg_button.png" hash="87d0f1b123f01c3aea3cb8a2b146306e"/><file name="button_up.gif" hash="7ad527f99b9975d5634fb2d5cc99e6b3"/><file name="buttons.gif" hash="2f14f1a3f0fb38790779c992a58654ae"/><file name="buttons.png" hash="b4a3f17370e03bf5d2a5cdf7800c25a7"/><file name="center-active.png" hash="5903988cd458cd794f23a212d51aa725"/><file name="center-inactive.png" hash="135b46aaa5c3b131a5a7e9c45c004e06"/><file name="filters.png" hash="3837ab6fcfe959833dd998533db1ca7f"/><file name="left-active.png" hash="86e94441b96a0d27d0b0a7e5108f86ed"/><file name="left-inactive.png" hash="0ddcb75aa9971cca39a5a65b4bdff8c4"/><file name="right-active.png" hash="320740ff608187301b06a96eab2f9e8e"/><file name="right-inactive.png" hash="cac4b39ab380353ffd5fdbcedb6e0a0a"/></dir><file name="star-active.png" hash="d4ab959a92bda610527a3e3942c4c0b0"/><file name="star-inactive.png" hash="f7fb99710be4c03ac23b1206f20e761d"/><file name="t-shirt.gif" hash="7505efdaabf13c4f8e26f7cfe15c8c96"/><file name="t-shirt.png" hash="46d7d1773118ef0a27353e8a9f6719fe"/><file name="women.png" hash="46d7d1773118ef0a27353e8a9f6719fe"/><file name="youth.png" hash="46d7d1773118ef0a27353e8a9f6719fe"/></dir></dir><file name="dropdown-arrow.gif" hash="332e99ca6b4d1e0d39972e04fb0b2395"/><file name="empty.png" hash="23dc9dc3c4751f83c2df7a5c42668824"/><file name="full-arrow-left.gif" hash="8ec91b60d38d1a16cba7670f2088a5c7"/><file name="full-arrow.gif" hash="36ddff0fca1c7d8900cb3633e0a30cea"/><file name="gel_green.png" hash="591959d831e8e42c9175d12a88f0bae2"/><file name="gel_red.png" hash="db442c023014df9da32b84bc1bb5a39f"/><file name="l-arrow.gif" hash="ee49f7eab64657b5131953acef0238fd"/><file name="r-arrow.gif" hash="d0429a9781e915fc9d9ca8875c470d32"/><file name="small_logo.gif" hash="d5c8be7c0f16aac2549759c0228492d6"/><file name="swatch_black.gif" hash="fd31d6a3a435c8ad1f7c43f346bb47e4"/><file name="swatch_custom.gif" hash="fb34791a48366957a141e12b563888c2"/><file name="swatch_default.gif" hash="fb34791a48366957a141e12b563888c2"/><file name="swatch_funk_leaf.gif" hash="f1d3ba87efb742b47da879a6f48909c4"/><file name="swatch_hot_red.gif" hash="d9363d45dc2993c2fdc3ea43c5b6f71c"/><file name="swatch_sky_blue.gif" hash="ded1455db119d09a3aedd7474fd1875a"/><file name="switch-arrow.gif" hash="dc7243962b341f366cd072d486687e6a"/><file name="tab_account.png" hash="27101fbaa78a07426be4768acc4c53ff"/><file name="tab_account_android.png" hash="77605cbc87f75ca17e91a5393765ceb1"/><file name="tab_account_ipad.png" hash="2997de5402195d0720309b73c6446fab"/><file name="tab_cart.png" hash="e803f760ee81cb35183f1122f388b774"/><file name="tab_cart_android.png" hash="477e97f8d03ea8aa674e952709f86578"/><file name="tab_empty.png" hash="bdd4cc355566e8861b2c45424ad94516"/><file name="tab_home.png" hash="dfa104e4da74e4a55d3c98d6ee0f7122"/><file name="tab_home_active.png" hash="bba5eb9bb724c84c1ede9e6f4bec3575"/><file name="tab_home_android.png" hash="1fefc6b070cc21b31b43194a7d85f9d9"/><file name="tab_info_android.png" hash="67fc19d8d926f7aede482f5a7083fc71"/><file name="tab_more.png" hash="2803359cb3e795bf67457e727aa16020"/><file name="tab_page.png" hash="ca05dbc42f944b8d4255f6675f6dd93a"/><file name="tab_search.png" hash="2cf29dbe325558353621b4241543204f"/><file name="tab_search_android.png" hash="932c2c568872fd9e119367c887f0539a"/><file name="tab_shop.png" hash="f36be0d3d27f2b37626247d3f6a55e2a"/><file name="tab_shop_active.png" hash="de907d6a52d477d4319649f9b0e2e4aa"/><file name="tab_shop_android.png" hash="e119fcd20f8cba856d550a64d775ddbb"/><file name="tmp-icon.gif" hash="58b759aecf3bdae26d5aaff7a0be5c90"/><file name="xmlconnect_tab.png" hash="cd99a7e01a42a6c82d866f7684faeb95"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="xmlconnect"><dir><dir name="catalog"><dir name="category"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir></dir><file name="tab_account.png" hash="0498d73e47ed47179e5546dc15c17dc7"/><file name="tab_cart.png" hash="9055ba76e256a51d3fee53a8c41d5226"/><file name="tab_home.png" hash="07d0af93e167b9366d3d4fb3d6cdb31c"/><file name="tab_more.png" hash="b9fc21feb8d7655bc9c2985c37b0de2f"/><file name="tab_page.png" hash="ca05dbc42f944b8d4255f6675f6dd93a"/><file name="tab_search.png" hash="25e880eb2a4d06828e2e1c3f32d22400"/><file name="tab_shop.png" hash="fe602fc2e7093efef5ecc0b027a32d91"/></dir></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="jscolor"><dir><dir name="jscolor"><file name="arrow.gif" hash="5034704a76cd55c1cbcbc58ea6bf523f"/><file name="cross.gif" hash="ba9a274b9323753cd95bc3b1eb2f4e5f"/><file name="demo.html" hash="edf71251cb2be20322d2efb00aee86a6"/><file name="hs.png" hash="fefa1a03d92ebad25c88dca94a0b63db"/><file name="hv.png" hash="990d71cada17da100653636cf8490884"/><file name="jscolor.js" hash="b65a1505390592ac6c0177d6b84774e0"/></dir></dir></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.5.0.0</min><max>1.5.1</max></package></required></dependencies>
-</package>
diff --git a/var/package/Phoenix_Moneybookers-1.2.4.xml b/var/package/Phoenix_Moneybookers-1.2.4.xml
deleted file mode 100644
index 778750dae3..0000000000
--- a/var/package/Phoenix_Moneybookers-1.2.4.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <name>Phoenix_Moneybookers</name>
-    <version>1.2.4</version>
-    <stability>alpha</stability>
-    <license>mixed</license>
-    <channel>community</channel>
-    <extends/>
-    <summary>Moneybookers payment gateway integration</summary>
-    <description>Moneybookers payment gateway official integration, implemented by Phoenix Medien GmbH. Provides integration for payment options powered by Moneybookers, as separate payment methods:
-All Credit Cards / Visa, Mastercard, AMEX, JCB, Diners - International
-CartaSi - Italy
-Lastschrift (ELV) - Germany
-Dankort - Denmark
-Nordea Solo - Sweden
-eNETS - Singapore
-Carte Bleue - France
-Giropay - Germany
-iDeal - Netherlands
-Laser - Ireland
-EPS Online-&#xDC;berweisung - Austria
-POLi - Australia
-Postepay - Italy
-Przelewy24 - Poland
-Sofort&#xFC;berweisung - Germany
-Nordea Solo - Finland
-Moneybookers eWallet</description>
-    <notes>1.2.4</notes>
-    <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
-    <date>2010-12-17</date>
-    <time>2010-12-17</time>
-    <contents><target name="magecommunity"><dir name="Phoenix"><dir name="Moneybookers"><dir name="Block"><file name="Form.php" hash="69ea349e817f1e61cd580d3f1aec98a6"/><file name="Info.php" hash="5062092dc12ac979d51f62df076c484c"/><file name="Jsinit.php" hash="181b71230ba85f9489cd94ee25c7f69e"/><file name="Payment.php" hash="cc12f2fcfc957382e04be716b70ab21c"/><file name="Placeform.php" hash="f3f499669cabe3a5f197d02437b89209"/><file name="Redirect.php" hash="8555e7d0a22936a0c72e2ad6527f3eda"/></dir><dir name="Helper"><file name="Data.php" hash="dee5ed5fbeb5058877d70cd3da1f1cea"/></dir><dir name="Model"><file name="Abstract.php" hash="ac518a9a051a24bf5badea61ac3693ae"/><file name="Acc.php" hash="84b9d75dd477ea05b4e96e40576568a2"/><file name="Csi.php" hash="a8de5bea52003baaa8af71697c551ea2"/><file name="Did.php" hash="52fc9085912c6c5ecdddee1427cdbd5c"/><file name="Dnk.php" hash="e030675ccadb5ffc5f6198865f447338"/><file name="Ebt.php" hash="940e2a9dc2c1de98c921d1da8f72c528"/><file name="Ent.php" hash="a7dcf758adce6a6fc9531320e0f94b41"/><file name="Event.php" hash="6a0974e49dd5de59b63df9a52d044344"/><file name="Gcb.php" hash="8641d7d32ed5dd1beb2d3f70b7c9dd10"/><file name="Gir.php" hash="e4c018afe24dae2b4263668b2f4ff9ec"/><file name="Idl.php" hash="bfa830d7e901d20d27f9c327a76d9402"/><file name="Lsr.php" hash="c39ed6f8b3b26bf096b429b8e256c06f"/><file name="Npy.php" hash="8dec432e005dc20d1d25267d4787b993"/><file name="Pli.php" hash="7b7e3cf2d6e5f67fbf252cb653aa1cfb"/><file name="Psp.php" hash="22a7676f817febce6cb2fac3259e9630"/><file name="Pwy.php" hash="b60b1ac86d51e47454c0900ab1241bdd"/><file name="Sft.php" hash="cf4c8b08ee4f459de12f2784507ad438"/><file name="So2.php" hash="7bf238df48ab5b4b688860f2518bd94c"/><file name="Wlt.php" hash="ef84c11ee7a44f6169c06c7dc320609e"/></dir><dir name="controllers"><file name="MoneybookersController.php" hash="79f384514987ab367f8bd59108b04a00"/><file name="ProcessingController.php" hash="e5c9ee9d48aa6ec56206f8ecfdc43968"/></dir><dir name="etc"><file name="config.xml" hash="b672cf87e57292bbea607f0c4fc7aa01"/><file name="system.xml" hash="9c93d1c5ce734f46f344af0e0746cff7"/></dir><dir name="sql"><dir name="moneybookers_setup"><file name="mysql4-upgrade-1.2-1.2.0.1.php" hash="3fa446a24b95d005bd4bea215fba4158"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Phoenix_Moneybookers.xml" hash="304935f2701d765b0b7c236ec6a083cc"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="moneybookers"><file name="info.phtml" hash="8f3cd1b6374617f6b32bd7628081c047"/><file name="jsinit.phtml" hash="ca2ff60ebd1a4a4344bfd29400202dfa"/><dir name="pdf"><file name="info.phtml" hash="09e7b1b673646e8fda49240831d68385"/></dir></dir></dir><dir name="layout"><file name="moneybookers.xml" hash="5cf6463c5434f212d9c020784624468a"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="moneybookers"><file name="blank.phtml" hash="979c41c03b99c115e8d321ef62894eb3"/><file name="form.phtml" hash="44f93280a7050abd4fe25e0afe06e7b5"/><file name="info.phtml" hash="5f2448d85c64230333f77c65a60d76b8"/><file name="payment.phtml" hash="5c6be84715f3136f10be5d3c6fd04d82"/><file name="placeform.phtml" hash="bda8632a83fd18084b940de62b0b34a6"/><file name="redirect.phtml" hash="99811d651f215827bbd85db9ade1824b"/></dir></dir><dir name="layout"><file name="moneybookers.xml" hash="80babadf83679af768eb2d851154f36e"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Phoenix_Moneybookers.csv" hash="2521bdd4053cd520ad1e2d1653f2543c"/><dir name="template"><dir name="email"><file name="moneybookers_activateemail.html" hash="c8cbc9e897052ed3806046512a785639"/></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="moneybookers"><file name="banner_120_de.png" hash="6c3f708fcb6dac92e53472d4c2246c68"/><file name="banner_120_fr.png" hash="8994d1dc3b4f5c9e5efc67ce3f9f55a9"/><file name="banner_120_int.png" hash="f9dfbc26041e52b34eea65348707d64f"/><file name="banner_120_pl.png" hash="67d3385f93bc9113880305ee7c7da9de"/><file name="banner_120_sp.png" hash="f9c4a653d6814ab3f8c535da706f5f77"/><file name="moneybookers_acc.png" hash="a3e639a68fafdffaca81e91985127735"/><file name="moneybookers_csi.gif" hash="4eec4ed7c494d01d518a3c6c691128e9"/><file name="moneybookers_did.gif" hash="6a3a3365894e9cdb199647a5b74ba35b"/><file name="moneybookers_dnk.gif" hash="7d4b8d27784f8a6fa6ef81c4e911831b"/><file name="moneybookers_ebt.gif" hash="9911d8cc223e7f3d9ec12f50c280ec61"/><file name="moneybookers_ent.gif" hash="704e9551ed4aff82b67114242b9fba1a"/><file name="moneybookers_gcb.gif" hash="e2e7c0f501e5ab0136f859ca5f57abc2"/><file name="moneybookers_gir.gif" hash="f16e949bc60bbd812f803d5e377d47f6"/><file name="moneybookers_idl.gif" hash="fe0ad1efc12d43df6c9ff3ffdd9dd59b"/><file name="moneybookers_lsr.gif" hash="58cdadfa20b6d37aeaa19e50995e4baf"/><file name="moneybookers_npy.gif" hash="01242c5ad7bc667e7493b550b6397fab"/><file name="moneybookers_pli.gif" hash="93989e85caff760af7a61838db0300bf"/><file name="moneybookers_psp.gif" hash="7abffc2246f172625be2ce31f4315cb2"/><file name="moneybookers_pwy.gif" hash="b4a0b9db9a031855e6e3899592012fae"/><file name="moneybookers_sft.gif" hash="e9e774163c99a8ab4deb18d37feaf658"/><file name="moneybookers_so2.gif" hash="9911d8cc223e7f3d9ec12f50c280ec61"/><file name="moneybookers_wlt.gif" hash="4b9cbc5aa5c32f3015ce7bec98da2670"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="moneybookers"><file name="banner.jpg" hash="382b1eea5550ce6c1b88cd4444058362"/></dir></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="mage"><dir name="adminhtml"><file name="moneybookers.js" hash="23aa035ee2785459ca7682b9689bfb03"/></dir></dir></dir></target></contents>
-    <compatible/>
-    <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.5.0.0-alpha1</min><max>1.6.0.0</max></package></required></dependencies>
-</package>