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

Conflicts:
	securityguards/en.lproj/Localizable.strings