TD2 correction

Metamodel + Model + Aspect + Xtend (transfo unfolding/folding)