actualizacion Gemfile
las cosas que estan aqui en el demo temporalmente
metiendole a los variant optionts
le metimos el yerro a variant options
arreglando referencia a variant options
Merge branch 'master' of https://github.com/openjaf/spree_travel_demo

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/store/all.js
	app/assets/stylesheets/store/all.css
	db/schema.rb