login images
c
Merge branch 'master' of https://github.com/yangyangduo/securityguards

Conflicts:
	securityguards.xcodeproj/project.pbxproj
login
Merge branch 'master' of https://github.com/yangyangduo/securityguards

Conflicts:
	securityguards.xcodeproj/project.pbxproj
c
Merge branch 'master' of https://github.com/yangyangduo/securityguards

Conflicts:
	securityguards.xcodeproj/project.pbxproj
	securityguards/en.lproj/Localizable.strings
	securityguards/zh-Hans.lproj/Localizable.strings
Merge branch 'master' of https://github.com/yangyangduo/securityguards
c
Merge branch 'master' of https://github.com/yangyangduo/securityguards

Conflicts:
	securityguards.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/yangyangduo/securityguards

Conflicts:
	securityguards/en.lproj/Localizable.strings
	securityguards/zh-Hans.lproj/Localizable.strings
c
c