modify animals
Merge branch 'master' of https://github.com/ekylibre/ekylibre

Conflicts:
	app/views/backend/animals/show.html.haml
Merge branch 'master' of https://github.com/ekylibre/ekylibre
creating / updating animals