Merge branch 'master' into develop

.gitignore

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

public/.htaccess

@@ -1,14 +1,14 @@
 <IfModule mod_rewrite.c>
-	<IfModule mod_negotiation.c>
-    	Options -MultiViews
+    <IfModule mod_negotiation.c>
+        Options -MultiViews
     </IfModule>
 
     RewriteEngine On
 
     # Redirect Trailing Slashes...
-	RewriteRule ^(.*)/$ /$1 [L,R=301]
+    RewriteRule ^(.*)/$ /$1 [L,R=301]
 
-	# Handle Front Controller...
+    # Handle Front Controller...
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteRule ^ index.php [L]