WIP: Rearrange new product form
Added 'Add Another' link to new product page. Altered redirects
Adding primary taxon migration to schema
Can add an image from redesigned new product page
Merge in master
Merge master (with primary taxons restored)
Remove unused overrides for primary taxons and product/new
Amend products controller spec to include requirement for primary_taxon_id
Adding specs for new product creation
Merge remote-tracking branch 'origin/master' into new-product-form
Fix master options_text display on front end
Rollback variant_unit_change check, auto-set primary taxons where they exist
Fix spec to check validation of missing primary_taxon correctly
Commenting out promo image from About tab in shopfront page. This needs an additional image style to be applied before it can be implemented correctly.
Initialise primary taxon in migration instead of in model callback
Do not show deleted products in order cycle admin
Remove spec for removed image
Revert "Do not show deleted products in order cycle admin"

This reverts commit 4e45a682fd6e93a54b273fda611091c6a286854d.
Merge branch 'master' into laura_and_will