Second
Merge branch 'master' of https://github.com/buffalohird/SecuritySpec

Conflicts:

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