fix
Merge branch 'master' of github.com:mokujin90/madam

Conflicts:
	protected/commands/EndTestCommand.php
auto login
Merge branch 'master' of github.com:mokujin90/madam