User Controller refactoring.
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/controllers/UserController.php