Updated gitignore
Updated woocommerce
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/plugins/woocommerce/assets/css/admin.css
	wp-content/plugins/woocommerce/assets/css/admin.less
	wp-content/plugins/woocommerce/assets/css/prettyPhoto.css
	wp-content/plugins/woocommerce/assets/css/prettyPhoto.less
	wp-content/plugins/woocommerce/assets/css/woocommerce.css
	wp-content/plugins/woocommerce/assets/css/woocommerce.less
	wp-content/plugins/woocommerce/assets/js/admin/meta-boxes-product-variation.js
	wp-content/plugins/woocommerce/assets/js/admin/meta-boxes-product-variation.min.js
	wp-content/plugins/woocommerce/assets/js/admin/woocommerce_admin.js
	wp-content/plugins/woocommerce/assets/js/admin/woocommerce_admin.min.js
	wp-content/plugins/woocommerce/i18n/countries.php
	wp-content/plugins/woocommerce/i18n/languages/woocommerce-admin.pot
	wp-content/plugins/woocommerce/i18n/languages/woocommerce.pot
	wp-content/plugins/woocommerce/i18n/states/AU.php
	wp-content/plugins/woocommerce/i18n/states/BD.php
	wp-content/plugins/woocommerce/i18n/states/BG.php
	wp-content/plugins/woocommerce/i18n/states/BR.php
	wp-content/plugins/woocommerce/i18n/states/CA.php
	wp-content/plugins/woocommerce/i18n/states/CN.php
	wp-content/plugins/woocommerce/i18n/states/ES.php
	wp-content/plugins/woocommerce/i18n/states/HK.php
	wp-content/plugins/woocommerce/i18n/states/HU.php
	wp-content/plugins/woocommerce/i18n/states/ID.php
	wp-content/plugins/woocommerce/i18n/states/IN.php
	wp-content/plugins/woocommerce/i18n/states/IR.php
	wp-content/plugins/woocommerce/i18n/states/IT.php
	wp-content/plugins/woocommerce/i18n/states/JP.php
	wp-content/plugins/woocommerce/i18n/states/MY.php
	wp-content/plugins/woocommerce/i18n/states/NZ.php
	wp-content/plugins/woocommerce/i18n/states/PE.php
	wp-content/plugins/woocommerce/i18n/states/TH.php
	wp-content/plugins/woocommerce/i18n/states/TR.php
	wp-content/plugins/woocommerce/i18n/states/US.php
	wp-content/plugins/woocommerce/i18n/states/ZA.php
	wp-content/plugins/woocommerce/includes/abstracts/abstract-wc-email.php
	wp-content/plugins/woocommerce/includes/abstracts/abstract-wc-integration.php
	wp-content/plugins/woocommerce/includes/abstracts/abstract-wc-order.php
	wp-content/plugins/woocommerce/includes/abstracts/abstract-wc-payment-gateway.php
	wp-content/plugins/woocommerce/includes/abstracts/abstract-wc-product.php
	wp-content/plugins/woocommerce/includes/abstracts/abstract-wc-shipping-method.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-addons.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-assets.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-attributes.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-dashboard.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-duplicate-product.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-help.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-importers.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-menus.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-meta-boxes.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-notices.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-permalink-settings.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-post-types.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-profile.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-reports.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-status.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-taxonomies.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin-welcome.php
	wp-content/plugins/woocommerce/includes/admin/class-wc-admin.php
	wp-content/plugins/woocommerce/includes/admin/importers/class-wc-tax-rate-importer.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-order-actions.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-order-data.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-order-downloads.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-order-items.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-order-notes.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-order-reviews.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-images.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-short-description.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-download-permission.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-fee.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-item.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-items.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-refund.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-shipping.php
	wp-content/plugins/woocommerce/includes/admin/meta-boxes/views/html-variation-admin.php
	wp-content/plugins/woocommerce/includes/admin/reports/class-wc-admin-report.php
	wp-content/plugins/woocommerce/includes/admin/reports/class-wc-report-customer-list.php
	wp-content/plugins/woocommerce/includes/admin/reports/class-wc-report-low-in-stock.php
	wp-content/plugins/woocommerce/includes/admin/reports/class-wc-report-most-stocked.php
	wp-content/plugins/woocommerce/includes/admin/reports/class-wc-report-out-of-stock.php
	wp-content/plugins/woocommerce/includes/admin/reports/class-wc-report-sales-by-date.php
	wp-content/plugins/woocommerce/includes/admin/reports/class-wc-report-stock.php
	wp-content/plugins/woocommerce/includes/admin/reports/class-wc-report-taxes-by-date.php
	wp-content/plugins/woocommerce/includes/admin/settings/class-wc-settings-accounts.php
	wp-content/plugins/woocommerce/includes/admin/settings/class-wc-settings-checkout.php
	wp-content/plugins/woocommerce/includes/admin/settings/class-wc-settings-emails.php
	wp-content/plugins/woocommerce/includes/admin/settings/class-wc-settings-integrations.php
	wp-content/plugins/woocommerce/includes/admin/settings/class-wc-settings-page.php
	wp-content/plugins/woocommerce/includes/admin/settings/class-wc-settings-products.php
	wp-content/plugins/woocommerce/includes/admin/settings/class-wc-settings-shipping.php
	wp-content/plugins/woocommerce/includes/admin/settings/class-wc-settings-tax.php
	wp-content/plugins/woocommerce/includes/admin/views/html-notice-template-check.php
	wp-content/plugins/woocommerce/includes/admin/views/html-notice-translation-upgrade.php
	wp-content/plugins/woocommerce/includes/admin/wc-admin-functions.php
	wp-content/plugins/woocommerce/includes/admin/wc-meta-box-functions.php
	wp-content/plugins/woocommerce/includes/api/class-wc-api-authentication.php
	wp-content/plugins/woocommerce/includes/api/class-wc-api-coupons.php
	wp-content/plugins/woocommerce/includes/api/class-wc-api-customers.php
	wp-content/plugins/woocommerce/includes/api/class-wc-api-exception.php
	wp-content/plugins/woocommerce/includes/api/class-wc-api-json-handler.php
	wp-content/plugins/woocommerce/includes/api/class-wc-api-orders.php
	wp-content/plugins/woocommerce/includes/api/class-wc-api-reports.php
	wp-content/plugins/woocommerce/includes/api/class-wc-api-resource.php
	wp-content/plugins/woocommerce/includes/api/class-wc-api-server.php
	wp-content/plugins/woocommerce/includes/api/class-wc-api-webhooks.php
	wp-content/plugins/woocommerce/includes/api/interface-wc-api-handler.php
	wp-content/plugins/woocommerce/includes/api/v1/class-wc-api-authentication.php
	wp-content/plugins/woocommerce/includes/api/v1/class-wc-api-coupons.php
	wp-content/plugins/woocommerce/includes/api/v1/class-wc-api-customers.php
	wp-content/plugins/woocommerce/includes/api/v1/class-wc-api-json-handler.php
	wp-content/plugins/woocommerce/includes/api/v1/class-wc-api-orders.php
	wp-content/plugins/woocommerce/includes/api/v1/class-wc-api-products.php
	wp-content/plugins/woocommerce/includes/api/v1/class-wc-api-reports.php
	wp-content/plugins/woocommerce/includes/api/v1/class-wc-api-resource.php
	wp-content/plugins/woocommerce/includes/api/v1/class-wc-api-server.php
	wp-content/plugins/woocommerce/includes/api/v1/class-wc-api-xml-handler.php
	wp-content/plugins/woocommerce/includes/api/v1/interface-wc-api-handler.php
	wp-content/plugins/woocommerce/includes/class-wc-ajax.php
	wp-content/plugins/woocommerce/includes/class-wc-api.php
	wp-content/plugins/woocommerce/includes/class-wc-cache-helper.php
	wp-content/plugins/woocommerce/includes/class-wc-checkout.php
	wp-content/plugins/woocommerce/includes/class-wc-comments.php
	wp-content/plugins/woocommerce/includes/class-wc-countries.php
	wp-content/plugins/woocommerce/includes/class-wc-coupon.php
	wp-content/plugins/woocommerce/includes/class-wc-customer.php
	wp-content/plugins/woocommerce/includes/class-wc-form-handler.php
	wp-content/plugins/woocommerce/includes/class-wc-https.php
	wp-content/plugins/woocommerce/includes/class-wc-install.php
	wp-content/plugins/woocommerce/includes/class-wc-language-pack-upgrader.php
	wp-content/plugins/woocommerce/includes/class-wc-order-factory.php
	wp-content/plugins/woocommerce/includes/class-wc-order-item-meta.php
	wp-content/plugins/woocommerce/includes/class-wc-order-refund.php
	wp-content/plugins/woocommerce/includes/class-wc-order.php
	wp-content/plugins/woocommerce/includes/class-wc-post-data.php
	wp-content/plugins/woocommerce/includes/class-wc-post-types.php
	wp-content/plugins/woocommerce/includes/class-wc-product-external.php
	wp-content/plugins/woocommerce/includes/class-wc-product-factory.php
	wp-content/plugins/woocommerce/includes/class-wc-product-grouped.php
	wp-content/plugins/woocommerce/includes/class-wc-product-simple.php
	wp-content/plugins/woocommerce/includes/class-wc-product-variable.php
	wp-content/plugins/woocommerce/includes/class-wc-product-variation.php
	wp-content/plugins/woocommerce/includes/class-wc-query.php
	wp-content/plugins/woocommerce/includes/class-wc-session-handler.php
	wp-content/plugins/woocommerce/includes/class-wc-shipping-rate.php
	wp-content/plugins/woocommerce/includes/class-wc-shipping.php
	wp-content/plugins/woocommerce/includes/class-wc-shortcodes.php
	wp-content/plugins/woocommerce/includes/class-wc-tax.php
	wp-content/plugins/woocommerce/includes/class-wc-webhook.php
	wp-content/plugins/woocommerce/includes/emails/class-wc-email-customer-completed-order.php
	wp-content/plugins/woocommerce/includes/emails/class-wc-email-customer-invoice.php
	wp-content/plugins/woocommerce/includes/emails/class-wc-email-customer-new-account.php
	wp-content/plugins/woocommerce/includes/emails/class-wc-email-customer-note.php
	wp-content/plugins/woocommerce/includes/emails/class-wc-email-customer-processing-order.php
	wp-content/plugins/woocommerce/includes/emails/class-wc-email-customer-reset-password.php
	wp-content/plugins/woocommerce/includes/emails/class-wc-email-new-order.php
	wp-content/plugins/woocommerce/includes/gateways/bacs/class-wc-gateway-bacs.php
	wp-content/plugins/woocommerce/includes/gateways/cheque/class-wc-gateway-cheque.php
	wp-content/plugins/woocommerce/includes/gateways/cod/class-wc-gateway-cod.php
	wp-content/plugins/woocommerce/includes/gateways/mijireh/class-wc-gateway-mijireh.php
	wp-content/plugins/woocommerce/includes/gateways/mijireh/includes/Address.php
	wp-content/plugins/woocommerce/includes/gateways/mijireh/includes/Item.php
	wp-content/plugins/woocommerce/includes/gateways/mijireh/includes/Mijireh.php
	wp-content/plugins/woocommerce/includes/gateways/mijireh/includes/Model.php
	wp-content/plugins/woocommerce/includes/gateways/mijireh/includes/Order.php
	wp-content/plugins/woocommerce/includes/gateways/mijireh/includes/Rest.php
	wp-content/plugins/woocommerce/includes/gateways/mijireh/includes/RestJSON.php
	wp-content/plugins/woocommerce/includes/gateways/paypal/class-wc-gateway-paypal.php
	wp-content/plugins/woocommerce/includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php
	wp-content/plugins/woocommerce/includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php
	wp-content/plugins/woocommerce/includes/libraries/class-cssmin.php
	wp-content/plugins/woocommerce/includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
	wp-content/plugins/woocommerce/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
	wp-content/plugins/woocommerce/includes/shipping/international-delivery/class-wc-shipping-international-delivery.php
	wp-content/plugins/woocommerce/includes/shipping/local-delivery/class-wc-shipping-local-delivery.php
	wp-content/plugins/woocommerce/includes/shipping/local-pickup/class-wc-shipping-local-pickup.php
	wp-content/plugins/woocommerce/includes/shortcodes/class-wc-shortcode-cart.php
	wp-content/plugins/woocommerce/includes/shortcodes/class-wc-shortcode-checkout.php
	wp-content/plugins/woocommerce/includes/shortcodes/class-wc-shortcode-order-tracking.php
	wp-content/plugins/woocommerce/includes/updates/woocommerce-update-1.4.php
	wp-content/plugins/woocommerce/includes/updates/woocommerce-update-1.5.php
	wp-content/plugins/woocommerce/includes/updates/woocommerce-update-2.0.9.php
	wp-content/plugins/woocommerce/includes/updates/woocommerce-update-2.0.php
	wp-content/plugins/woocommerce/includes/updates/woocommerce-update-2.1.php
	wp-content/plugins/woocommerce/includes/updates/woocommerce-update-2.2.php
	wp-content/plugins/woocommerce/includes/walkers/class-product-cat-dropdown-walker.php
	wp-content/plugins/woocommerce/includes/walkers/class-product-cat-list-walker.php
	wp-content/plugins/woocommerce/includes/wc-attribute-functions.php
	wp-content/plugins/woocommerce/includes/wc-cart-functions.php
	wp-content/plugins/woocommerce/includes/wc-conditional-functions.php
	wp-content/plugins/woocommerce/includes/wc-core-functions.php
	wp-content/plugins/woocommerce/includes/wc-coupon-functions.php
	wp-content/plugins/woocommerce/includes/wc-deprecated-functions.php
	wp-content/plugins/woocommerce/includes/wc-formatting-functions.php
	wp-content/plugins/woocommerce/includes/wc-notice-functions.php
	wp-content/plugins/woocommerce/includes/wc-order-functions.php
	wp-content/plugins/woocommerce/includes/wc-template-functions.php
	wp-content/plugins/woocommerce/includes/wc-template-hooks.php
	wp-content/plugins/woocommerce/includes/wc-term-functions.php
	wp-content/plugins/woocommerce/includes/widgets/class-wc-widget-cart.php
	wp-content/plugins/woocommerce/includes/widgets/class-wc-widget-layered-nav-filters.php
	wp-content/plugins/woocommerce/includes/widgets/class-wc-widget-layered-nav.php
	wp-content/plugins/woocommerce/includes/widgets/class-wc-widget-price-filter.php
	wp-content/plugins/woocommerce/includes/widgets/class-wc-widget-product-categories.php
	wp-content/plugins/woocommerce/includes/widgets/class-wc-widget-product-search.php
	wp-content/plugins/woocommerce/includes/widgets/class-wc-widget-product-tag-cloud.php
	wp-content/plugins/woocommerce/includes/widgets/class-wc-widget-products.php
	wp-content/plugins/woocommerce/includes/widgets/class-wc-widget-recent-reviews.php
	wp-content/plugins/woocommerce/includes/widgets/class-wc-widget-recently-viewed.php
	wp-content/plugins/woocommerce/includes/widgets/class-wc-widget-top-rated-products.php
	wp-content/plugins/woocommerce/readme.txt
	wp-content/plugins/woocommerce/templates/cart/cart-empty.php
	wp-content/plugins/woocommerce/templates/emails/email-order-items.php
	wp-content/plugins/woocommerce/templates/emails/plain/email-order-items.php
	wp-content/plugins/woocommerce/templates/global/breadcrumb.php
	wp-content/plugins/woocommerce/templates/loop/pagination.php
	wp-content/plugins/woocommerce/woocommerce.php