Cleans procedures and nomenclatures
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	Gemfile
	lib/aggeratio.rb
Removes sex/reproductor from products table
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	config/locales/arb/nomenclatures.yml
	config/locales/eng/nomenclatures.yml
	config/locales/jpn/nomenclatures.yml
	config/locales/spa/nomenclatures.yml
	config/modules.xml
	lib/tasks/demo.rake
	test/fixtures/product_prices.yml