re-add tracking management
update nomenclatures and clean code.
Merge branch 'master' of https://github.com/ekylibre/ekylibre