ajout tombinoscope AID dans changelog.txt
Merge branch 'master' of https://github.com/tbelliard/gepi

Conflicts:
	changelog.txt
Merge branch 'master' of https://github.com/tbelliard/gepi
Merge branch 'master' of https://github.com/tbelliard/gepi
Merge branch 'release-1.6.4'
Merge branch 'master' of https://github.com/tbelliard/gepi
Merge branch 'master' of git@github.com:Regis85/gepi.git into dev_abs_traitemenParClasse