refactored and updated with latest changes from yii-usr
Merge branch 'master' of github.com:nineinchnick/yii2-usr

Conflicts:
	controllers/UsrController.php