Merge pull request #2 from suyccom/todo_10042_variations_product_type

Todo 10042 variations product type
Add whiskey disk for deployments
Add bundle exec to whiskey disk post deploy tasks
Make sure the language setting in saved to DB
Make sure the menu is translated correctly
Merge branch 'master' into todo_10042_variations_product_type

Conflicts:
	db/schema.rb