Merge branch 'master' into develop

app/config/app.php

@@ -60,8 +60,8 @@ return array(
 	|--------------------------------------------------------------------------
 	|
 	| This key is used by the Illuminate encrypter service and should be set
-	| to a random, long string, otherwise these encrypted values will not
-	| be safe. Make sure to change it before deploying any application!
+	| to a random, 32 character string, otherwise these encrypted strings
+	| will not be safe. Please do this before deploying an application!
 	|
 	*/
 

composer.json

@@ -1,7 +1,7 @@
 {
-    "name": "laravel/laravel",
-    "description": "The Laravel Framework.",
-    "keywords": ["framework", "laravel"],
+	"name": "laravel/laravel",
+	"description": "The Laravel Framework.",
+	"keywords": ["framework", "laravel"],
 	"require": {
 		"laravel/framework": "4.1.*"
 	},
@@ -16,14 +16,17 @@
 		]
 	},
 	"scripts": {
-		"pre-update-cmd": [
-			"php artisan clear-compiled"
-		],
 		"post-install-cmd": [
 			"php artisan optimize"
 		],
+		"pre-update-cmd": [
+			"php artisan clear-compiled"
+		],
 		"post-update-cmd": [
 			"php artisan optimize"
+		],
+		"post-create-project-cmd": [
+			"php artisan key:generate"
 		]
 	},
 	"config": {