测试branch使用
Revert "测试branch使用"

This reverts commit 73d90966519e752848b382a175255cd2247b9c77.
Revert "Revert "测试branch使用""

This reverts commit 9eaa8e16610bf79d3c072b343cfd419df5dd9028.
Merge remote-tracking branch 'origin/master'

Conflicts:
	login.php
修改login.php
Merge pull request #2 from qualityTeam5/master

主干合并到分支