modified:   shipping-methods-async.js
	modified:   admin/post-types/shop_order.php
	modified:   admin/woocommerce-admin-init.php
	modified:   admin/woocommerce-admin-taxonomies.php
	renamed:    assets/js/frontend/cart.js -> assets/js/frontend/cart.bak.js
	modified:   assets/js/frontend/cart.js
	new file:   assets/js/frontend/checkout.bak.js
	modified:   assets/js/frontend/checkout.js
	new file:   assets/js/frontend/functions.js
	modified:   assets/js/frontend/shipping-methods-async.js
	modified:   assets/js/frontend/woocommerce.js
	modified:   classes/class-wc-cart.php
	modified:   templates/archive-product.php
	modified:   templates/cart/totals.php
	modified:   woocommerce-ajax.php
	modified:   woocommerce-core-functions.php
	modified:   woocommerce.php
	deleted:    assets/js/frontend/cart.bak.js
	deleted:    assets/js/frontend/checkout.bak.js
	modified:   assets/js/frontend/checkout.js
	deleted:    templates/cart/shipping-methods.php
Merge branch 'master' of https://github.com/amgroup/woocommerce-pg

Conflicts:
	assets/js/frontend/shipping-methods-async.js

	deleted:    assets/js/frontend/cart.bak.js
	deleted:    assets/js/frontend/checkout.bak.js
	modified:   assets/js/frontend/checkout.js
	deleted:    assets/js/frontend/shipping-methods-async.js
	deleted:    templates/cart/shipping-methods.php