change Jasper call
Merge branch 'master' of https://github.com/ekylibre/ekylibre

Conflicts:
	app/controllers/animal_events_controller.rb
Merge branch 'master' of https://github.com/ekylibre/ekylibre
correcting icon in view
translating animals / events / dashboard
adding enumerize translations for animals
Fixes #90 and adding a parameter
Merge branch 'master' of https://github.com/ekylibre/ekylibre