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

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