before pull
sync
Merge branch 'master' of https://github.com/idemobi/AXFilesTemplates

Conflicts:

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