Use population instead of net_surface_area for LandParcel counter
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	lib/tasks/demo/land_parcels.rb
Cleans code
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	config/locales/arb/nomenclatures.yml
	config/locales/eng/nomenclatures.yml
	config/locales/fra/complement.yml
	config/locales/fra/nomenclatures.yml
	config/locales/jpn/nomenclatures.yml
	config/locales/spa/nomenclatures.yml
	config/locales/statistics.yml
	lib/tasks/demo/land_parcels.rb
	test/fixtures/cultivable_zone_memberships.yml