update to master
Merge branch 'master' of https://github.com/githubjeka/angular-yii2