Reorganizes entities#show
Prepares nitrogen_inputs calculator
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	config/locales/statistics.yml