continu on equipment demo task
Merge branch 'master' of https://github.com/ekylibre/ekylibre

Conflicts:
	config/nomenclatures/abilities.xml
continu on equipment demo task