tutorial additions
Merge branch 'master' of https://github.com/thyseus/yii-user-management

Conflicts:
	user/models/YumUser.php