Merge branch 'master' of github.com:yiisoft/yii2

* 'master' of github.com:yiisoft/yii2:
  Corrected default paths for Twig and Smarty

framework/renderers/SmartyViewRenderer.php

@@ -26,7 +26,7 @@ class SmartyViewRenderer extends ViewRenderer
 	/**
 	 * @var string the directory or path alias pointing to where Smarty code is located.
 	 */
-	public $smartyPath = '@app/vendors/Smarty';
+	public $smartyPath = '@yii/vendor/smarty/smarty/distribution/libs';
 
 	/**
 	 * @var string the directory or path alias pointing to where Smarty cache will be stored.

framework/renderers/TwigViewRenderer.php

@@ -25,7 +25,7 @@ class TwigViewRenderer extends ViewRenderer
 	/**
 	 * @var string the directory or path alias pointing to where Twig code is located.
 	 */
-	public $twigPath = '@Twig';
+	public $twigPath = '@yii/vendor/twig/twig/lib/Twig';
 
 	/**
 	 * @var string the directory or path alias pointing to where Twig cache will be stored.