model de base sauvegarde avant modification importante
transform
Merge branch 'master' of https://github.com/idemobi/AXFilesTemplates

Conflicts:

AXFilesTemplates.xcodeproj/project.xcworkspace/xcuserdata/Kortex.xcuserd
atad/UserInterfaceState.xcuserstate
pull and commit
Merge branch 'master' of https://github.com/idemobi/AXFilesTemplates

Conflicts:

AXFilesTemplates.xcodeproj/project.xcworkspace/xcuserdata/Kortex.xcuserd
atad/UserInterfaceState.xcuserstate