Fix indentation in README
Mailers now require a from address, so we need to give defaults, using MailMethod.current

Conflicts:
	api/spec/controllers/spree/api/v1/shipments_controller_spec.rb
	core/app/models/spree/app_configuration.rb
Truncate product description when used as meta description

Fixes #2396

Conflicts:
	core/spec/helpers/base_helper_spec.rb
Correct MailMethod usage in mail_interceptor, order mailer and shipment mailer specs
Fix jirafe admin settings styling

Fixes #2733
Move currnet_currency and ip_address helpers to ControllerHelpers::Order, where they're required
Added checked values for the radio_button_tag of currency_symbol. fixes #2755

Fixes #2756
Fix value of back_to_properties_list in en.yml

Fixes #2753
Don't require payment methods if payment isn't required
Revert "Don't require payment methods if payment isn't required"

This reverts commit 318b820114d6d631e9be6ddb500e6a234612407f.

This is causing build breakages:

http://ci.spreecommerce.com/viewLog.html?buildId=1533&buildTypeId=bt5&tab=buildLog

payment_required? is calling update_totals, which causes a massive callback
chain and ultimately results in these tests failing
Must specify class_name for order association on LineItem

So that it doesn't attempt to look up Order and not Spree::Order when assigning it via association
Fix translation issue for no and yes keys in YAML

Fixes #2763
Change in amount precision limit

Fixes #2715
Fixes #2716
Change in amount precision for spree adjustments

Fixes #2715
Fixes #2716
Update extension generator dependency versions.

Fixes #2743
Empty user promotion rule should not be eligible

Fixes #2749
Run extension installation generator during rake test_app.

Fixes #2741
Minor refactor: extract gateway order id to method

This will allow people to more easily override the order id passed
in to the payment gateway.  It will behave the same for existing
functionality.

Fixes #2732

Conflicts:
	core/app/models/spree/payment/processing.rb
Correct filename for diners club credit card icon

Fixes #2726

Conflicts:
	frontend/app/assets/images/credit_cards/icons/diners_club.png
Fix styles for empty orders list in admin

Fixes #2734