Merge branch 'master_variant' of https://github.com/Grantismo/spree_digital

Conflicts:
	app/views/spree/admin/digitals/_form.html.erb