Repairs tests and cleans code
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	app/controllers/animal_diseases_controller.rb
	app/controllers/animal_drugs_controller.rb
	app/controllers/animal_event_natures_controller.rb
	app/controllers/animal_events_controller.rb
	app/controllers/animal_groups_controller.rb
	app/controllers/animal_posologies_controller.rb
	app/controllers/animal_prescriptions_controller.rb
	app/controllers/animals_controller.rb
	app/controllers/entities_controller.rb
	app/controllers/units_controller.rb
	app/models/animal_event.rb
	app/views/animal_diagnostics/show.html.haml
	app/views/animal_diseases/show.html.haml
	app/views/animal_events/_form.html.haml
	app/views/animal_posologies/_form.html.haml
	config/locales/fra/help/animal_events-index.txt
	config/routes.rb