update animal integration test
Merge branch 'master' of https://github.com/ekylibre/ekylibre

Conflicts:
	test/integration/add_a_new_animal_test.rb
Merge branch 'master' of https://github.com/ekylibre/ekylibre
Merge branch 'master' of https://github.com/ekylibre/ekylibre
Merge branch 'master' of https://github.com/ekylibre/ekylibre
fix confict
update taxes
Merge branch 'master' of https://github.com/ekylibre/ekylibre
update gem file