Switching emails to use id instead of actual model object for order and shipments
Switching to something other than :id for object testing.
Improving detection of object vs id
Merge pull request #1 from gobigwin/feature/send-emails-with-model-ids-not-model-objects

Feature/send emails with model ids not model objects
Updating Modernizr to 2.6.2
Merge branch '1-3-stable' of github.com:gobigwin/spree into 1-3-stable
Merge pull request #2 from BuckBuchanan/1-3-stable

pretty time should use capital M for minutes
Adding current_store promo rule
Merge pull request #3 from BuckBuchanan/feature/current-store-promo-rule

Adding current_store promo rule
Do not allow one product to be assigned to the same taxon more than once
Merge pull request #4 from BuckBuchanan/fix/ensure/uniqueness-of-product-taxon-association

Do not allow one product to be assigned to the same taxon more than once
Moving the admin JSON product search to the search controller
Added a new promo rule named 'Products Exclusion'
Fixing product exclusioin rule and adding specs for the new product exclusion rule

minor fix to the spec messages
Merge pull request #7 from kanwal0801/products_exclusion

Adding a new promotion rule - products exclusion rule
Adding ship_address_country and bill_address_country promo rule
Merge pull request #8 from kanwal0801/ship_and_bill_address_promo_rule

Adding ship_address_country and bill_address_country promo rule
Disabling admin add_line_item_to_order so I can use the spree_flexi_variants version instead
Merge pull request #10 from BuckBuchanan/fix/disable-admin-order-add-line-item

Disabling admin add_line_item_to_order so I can use the spree_flexi_vari...