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

Conflicts:
	protected/commands/EndTestCommand.php
fix
Merge branch 'master' of github.com:mokujin90/madam
15 min
Merge branch 'master' of github.com:mokujin90/madam

Conflicts:
	protected/messages/de/main.php
	protected/messages/en_US/main.php