Merge branch 'master' into develop

.gitignore

@@ -2,7 +2,7 @@
 /vendor
 composer.phar
 composer.lock
-.env.local.php
+.env.*.php
 .env.php
 .DS_Store
 Thumbs.db

app/config/app.php

@@ -13,7 +13,7 @@ return array(
 	|
 	*/
 
-	'debug' => true,
+	'debug' => false,
 
 	/*
 	|--------------------------------------------------------------------------

app/config/local/app.php

@@ -0,0 +1,18 @@
+<?php
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| Application Debug Mode
+	|--------------------------------------------------------------------------
+	|
+	| When your application is in debug mode, detailed error messages with
+	| stack traces will be shown on every error that occurs within your
+	| application. If disabled, a simple generic error page is shown.
+	|
+	*/
+
+	'debug' => true,
+
+);