Merge branch 'master' of https://github.com/schmunk42/yii2

Conflicts:
	apps/advanced/README.md
	apps/basic/README.md

README.md

@@ -73,4 +73,4 @@ php composer.phar create-project
 
 *Note: If the above command fails with `[RuntimeException] Not enough arguments.` run
 `php composer.phar self-update` to obtain an updated version of composer which supports creating projects
-from local packages.*
+from local packages.*