Conflicts fixed after pull .
Conflicts fixed after pull .

aiddroid/yii2-starter-kit,torkalas/starter,hezll/tipple-invoice,aiddroid/yii2-starter-kit,akhatnya/testing,scriptius/mayarossa_advanced,phongln/yii2-starter-kit,ddinchev/yii2-starter-kit,rzrio/razormind-rzrio-site,limmer77/yii2-cms,phongln/yii2-starter-kit,XzAeRo/yii2-hybrid-kit,vanzhilov/yii2-starter-kit,hysdop/kit,CrazyZx3525959/yii2-starter-kit,limmer77/yii2-cms,hysdop/kit,davidjeddy/zeroforksgiven,rzrio/razormind-rzrio-site,hdushku/yii2-starter-kit,CrazyZx3525959/yii2-starter-kit,aiddroid/yii2-starter-kit,XzAeRo/yii2-hybrid-kit,davidjeddy/zeroforksgiven,torkalas/starter,bethrezen/yii2-starter-kit,ddinchev/yii2-starter-kit,rzrio/razormind-rzrio-site,evan70/yii2-starter-kit,scriptius/mayarossa_advanced,hdushku/yii2-starter-kit,rzrio/razormind-rzrio-site,hysdop/kit,vanzhilov/yii2-starter-kit,hezll/tipple-invoice,phongln/yii2-starter-kit,Wolframcheg/yii2-starter-kit,evan70/yii2-starter-kit,Wolframcheg/yii2-starter-kit,akhatnya/testing,bethrezen/yii2-starter-kit,XzAeRo/yii2-hybrid-kit