small fix in userIdentity and updated config
Merge branch 'master' of https://github.com/nineinchnick/yii-demo
Merge branch 'master' of https://github.com/nineinchnick/yii-demo
Merge branch 'master' of https://github.com/nineinchnick/yii-demo
Merge branch 'master' of https://github.com/nineinchnick/yii-demo
Merge branch 'master' of https://github.com/nineinchnick/yii-demo
Merge branch 'master' of https://github.com/nineinchnick/yii-demo
Merge branch 'master' of https://github.com/nineinchnick/yii-demo
merge branch 'master' of https://github.com/nineinchnick/yii-demo
Merge branch 'master' of https://github.com/nineinchnick/yii-demo
Merge branch 'master' of https://github.com/nineinchnick/yii-demo
Merge branch 'master' of https://github.com/nineinchnick/yii-demo
Merge branch 'master' of https://github.com/nineinchnick/yii-demo
enable Hybridauth login through facebook and openid in usr module
Merge branch 'master' of https://github.com/nineinchnick/yii-demo

Conflicts:
	protected/config/main.php
enable Hybridauth login through facebook and openid in usr module
Merge branch 'master' of https://github.com/nineinchnick/yii-demo

Conflicts:
	protected/config/main.php
new model to hold remote user identities
Merge branch 'master' of https://github.com/nineinchnick/yii-demo

Conflicts:
	protected/components/UserIdentity.php
fix typo