Hot fix transport
Stash conflict
Merge branch 'hotfix'

Conflicts:
	protected/components/WebUser.php