c
Merge branch 'master' of https://github.com/ekylibre/ekylibre

Conflicts:
	app/views/backend/land_parcels/index.html.haml
update production and activity show view