Merge branch 'master', remote-tracking branch 'origin'
Merge remote-tracking branch 'origin/master'
WIP Upgrade to Spree 1.3
WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name
Changed Sass variable:  back to our green colour following upgrade
WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name
Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue
Rollback all Spree 1.3 migrations
Rollback all Spree 1.3 migrations (forgot db/schema.rb)
Upgrade database to Spree 1.2
Upgrade database to Spree 1.3
Added down method to remove_display_on_from_payment_methods migration
Finished revision of defaces
Add analytics helper to Enterprises Controller
Change reference to method 'has_role' to 'has_spree_role' in CMS initialiser (required for Spree 1.3)
Remove unnecessary include of Spree::Core::CurrentOrder (helper is now accessible by all controllers in Spree 1.3)
Update cms_admin spec work after Spree 1.3 upgrade broke it
Move set_current_order override to new location in lib (Spree 1.3 Upgrade), and update home controller test
Remove unneeded :partial from override
Move additional of tabs to main nav bar to defaces, rather than overriding view directly