ok
Merge branch 'master' of https://github.com/quicksilver71/Ang

Conflicts:

AngeloProto.xcodeproj/project.xcworkspace/xcshareddata/AngeloProto.xcche
ckout

AngeloProto.xcodeproj/project.xcworkspace/xcuserdata/massimilianodidomen
ico.xcuserdatad/UserInterfaceState.xcuserstate
ok