add latest fixes
Merge branch 'master' of https://github.com/ekylibre/ekylibre
Merge branch 'master' of https://github.com/ekylibre/ekylibre

Conflicts:
	app/models/animal.rb
first refactor of demo task (models and some linking methods ) up to Incoming Deliveries.