support for yii2 beta
Merge remote-tracking branch 'origin/master'

Conflicts:
	default/basemodel.php