Fixes product_measurement and incorrect demo data
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	app/views/backend/cells/currents_stocks_by_product_nature_cells/show.html.haml
	app/views/backend/cells/meteo_cells/show.html.haml