fixes some trad
Cleans code
Merge branch 'master' of https://github.com/ekylibre/ekylibre