Fix admin/gift_cards_controller. [Fixes #2]
Use display_price.
Update Spree dependency.
Only call apply_coupon_code if using Spree::Promo.
Use #try when checking if product is gift card.
Fix conflict cherry picking 1-3 branch fix.
fix error if not tracking inventory
Add a brief wait to try fixing frailty w/travis.
Add a note about seeding the gift card product when not doing installation.
Fix uninitialized constant Calculator occurring in development.
Dont include admin helper...
Add 2.0.0 to travis builds.
Better support for async mailers
Spree 2.0 fixes.
Merge pull request #11 from trappist/master

Better support for async mailers
Fix spec.
update views to fix spree 1.3

Conflicts:
	app/views/spree/admin/gift_cards/_form.html.erb
add pagination to admin gift card index page
Port to Spree 2.0 translations.
Namespace to spree: