Some work made with Ina Cesco
Resolving merge conflict
Replacing some jcom. into j. forgotten during the merge
Removing all j.preset and all component key word