fix test
Merge branch 'master' into develop

* master:
  fix test

Conflicts:
	ZYreloginViewController.m