add login form
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/components/UserIdentity.php
Merge remote-tracking branch 'origin/master'
continue authorization