MAJ tb_note
Resolve conflict
Merge branch 'master' of https://github.com/griloox/AppliStage