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

apps/bootstrap/composer.json

@@ -12,9 +12,6 @@
 		"irc": "irc://irc.freenode.net/yii",
 		"source": "https://github.com/yiisoft/yii2"
 	},
-	"config": {
-		"vendor-dir": "vendor"
-	},
 	"minimum-stability": "dev",
 	"require": {
 		"php": ">=5.3.0",

yii/composer.json

@@ -64,10 +64,14 @@
 		"source": "https://github.com/yiisoft/yii2"
 	},
 	"require": {
-		"php": ">=5.3.0",
+		"php": ">=5.3.11",
-		"michelf/php-markdown": "1.3",
+		"ext-mbstring": "*",
-		"twig/twig": "1.12.*",
+		"lib-pcre": "*"
-		"smarty/smarty": "3.1.*",
+	},
-		"ezyang/htmlpurifier": "v4.5.0"
+	"suggest": {
+		"michelf/php-markdown": "Required for Markdown helper.",
+		"twig/twig": "Required for TwigViewRenderer.",
+		"smarty/smarty": "Required for SmartyViewRenderer.",
+		"ezyang/htmlpurifier": "Required for Purifier helper."
 	}
 }