Adds product variants
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	lib/tasks/demo.rake