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

Conflicts:
	securityguards/RegisterStep1ViewController.m
	securityguards/RegisterStep2ViewController.h
	securityguards/RegisterStep2ViewController.m