merged with master
merged with master

alfredleo/yii2-app-basic,AdeAttwood/Yii2-Basic-Grunt,yiisoft/yii2-app-basic,yiisoft/yii2-app-basic,githubjeka/yii2-app-basic,dasscheman/yii2-app-basic,githubjeka/yii2-app-basic,AdeAttwood/Yii2-Basic-Grunt,AdeAttwood/Yii2-Basic-Grunt,dasscheman/yii2-app-basic,jarioneto/yii2-app-rest