Merge branch 'master' into develop

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "laravel/framework",
+    "name": "laravel/laravel",
     "description": "The Laravel Framework.",
     "keywords": ["framework", "laravel"],
 	"require": {