unos cambiecitos
Merge remote-tracking branch 'cesar-local/options' into develop

Conflicts:
	app/assets/javascripts/store/spree_travel_core.js
	app/models/spree/option_value_decorator.rb
	app/models/spree/product_decorator.rb
	app/models/spree/variant_decorator.rb
updating spree version
Fixed requirements on the assets to match spree version
Merge remote-tracking branch 'origin/options' into develop
Merge remote-tracking branch 'origin/options' into develop
Merge remote-tracking branch 'origin/master' into develop
Fixed verification for @product being nil on _search_box partial
Switched permalinks for slugs, missing default calculator on products
Fixed bug with id on new product form preventing product_type for being setted
Removed ! in values.map from options_text in variant_decorator for a malfunction with empty collections
Fixed some errors regarding the dynamic calculation of prices and TODO in spree_travel_core.js
Merge pull request #1 from openjaf/2-3-stable

2 3 stable