Some changes
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	lib/userstamp/stampable.rb
Renames ProductNaturePrice with ProductPriceTemplate and EntityCategory with ProductPriceListing