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.
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
Merging in changes from spree/spree_store_credits 1-3-stable remote branch.
Indentation change.
Adding payment method to order_decorator for compatibility with spree/spree 1-3-stable branch.