ff
Merge branch 'master' of https://github.com/yangyangduo/securityguards

Conflicts:
	securityguards.xcodeproj/project.pbxproj