Fixes stub_authorization! for RSpec 3.
Fixes #5182
Don't allow adding products to order if it's already shipped.
Fix typo.
add more logic to outstancing balance and order updater to set the correct payment_state on the order when the order is canceled.

Fixes #5106
Closes #5193
Use rspec-retry to get past random phantomjs failures (turn off by default)

Closes #5178

Conflicts:
	common_spree_dependencies.rb
fix ignore_types to work with FlashHash in rails 4.1
Fixes #5192
Add track_inventory to permitted attributes.
Merging latest 2-3 stuff
Adding appropriate tests for the splitting of shipments
Removing unncessary Kaminari call
Removing LineItems controller refactoring
Reindenting the line_items_controller private methods
Re-indenting the line item autocomplete
Fix for merge failure
Not allowing you to edit the cart or shipments after shipping