Update id for fieldset
Updates fields
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	app/views/animal_events/_diagnostic_fields.html.haml
	app/views/animal_events/_treatment_fields.html.haml
Fixes bugs on label and scopes for unroll
Merge master and cleans code

Conflicts:
	app/controllers/animal_events_controller.rb
	app/controllers/animal_prescriptions_controller.rb
	app/controllers/animals_controller.rb
	app/controllers/units_controller.rb
	app/themes/tekyla/stylesheets/screen.css.scss
	config/locales/arb/models.yml
	config/locales/eng/models.yml
	config/locales/jpn/models.yml
	config/locales/spa/models.yml
	config/rights.yml
	config/routes.rb