Remove strong_parameters gem references + attr_accessible from Order model
Remove conflicts from variant.rb
[api] Remove conflicts from checkouts_controller_spec
[api] remove conflict line from Changelog
Fix deprecation warning for variants_including_master association
Correct table name for shipping_method zones associations