working on animals model and reporting
Merge branch 'master' of https://github.com/ekylibre/ekylibre
adapt to new form system
Merge branch 'master' of https://github.com/ekylibre/ekylibre

Conflicts:
	app/models/unit.rb
modify some view and controller to prepare new system