mahailong

long
Merge branch 'master' of https://github.com/SunaoTeam/exercise20113061

Conflicts:
	exercise201130619/LoginViewController/LoginViewController.m