Domain fix
Merge origin/develop into develop

Conflicts:
	protected/commands/GeneralCommand.php