Merge remote-tracking branch 'origin/options' into develop
updating gemspec
fixing generators
changing names
bug fixing
bug fixing
fixing assets
sample shipping categories
sample taxonomies
deleting option types
deleting option values
delete product types
commenting calculators
bug fixing
sample taxons
sample properties
fixing properties
fixingtaxons
samble products
removing task (moving to spree travel sample)