Update Versionfile
Update consume_users_credit hook to work with Spree 1.2+ [fix #26]
Fix consuming user credits upon completion.
Allow mass assignment of preferred_amount for GiveStoreCredit action.
Change admin config view per admin redesign in 1.3

Fix admin views_decorator.rb

Remove manage store credits text

Update promo partial and add preference_amount as attr_accessible (per the rails 3.2 security update)

Conflicts:
	app/models/spree/promotion/actions/give_store_credit.rb
	app/views/spree/admin/promotions/actions/_give_store_credit.html.erb
Update app/overrides/views_decorator.rb

Reformatting Deface::Override call to admin/store_credits/limit partial to match other calls. Disabling same call since the limit partial is not included in the source tree and causes a fatal error.
Merge pull request #29 from patryn20/master

Disabling broken Deface::Override call to missing store_credits/limit partial
Prevents method from being created twice in production.
Removes extra comma
Merge branch '1-3-stable'

Conflicts:
	app/models/spree/order_decorator.rb
	app/models/spree/promotion/actions/give_store_credit.rb
	app/overrides/views_decorator.rb
	app/views/spree/admin/promotions/actions/_give_store_credit.html.erb
Removes payment - no longer an available method
Update app/overrides/views_decorator.rb

Reformatting Deface::Override call to admin/store_credits/limit partial to match other calls. Disabling same call since the limit partial is not included in the source tree and causes a fatal error.
More integration tests.

Conflicts:
	app/models/spree/promotion/actions/give_store_credit.rb
Removes dead override
Removes dependency on old Spree::Order payment method.

Replaces dependency on the old payment method copied from Spree::Order
model with calls to the state aware pending_payments method from
Spree::Order. Only applies to the first pending payment to ensure
credit is not applied multiple times on same order.
change current_user to spree_current_user
Don't require order minimum for store credits by default

Further README tweak to show implementation of preference
Add german translation.

Fixes #51
Use Spree::Price to parse the credit value.

Fixes #56
Merge branch '1-3-stable' of github.com:spree/spree_store_credits into 1-3-stable

Conflicts:
	app/models/spree/order_decorator.rb
	app/models/spree/promotion/actions/give_store_credit.rb
	app/overrides/views_decorator.rb