Merge branch 'master' into develop

app/views/hello.php

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <title>Laravel PHP Framework</title>
     <style>
-        @import url(http://fonts.googleapis.com/css?family=Lato:300,400,700);
+        @import url(//fonts.googleapis.com/css?family=Lato:300,400,700);
 
         body {
             margin:0;

public/.htaccess

@@ -1,7 +1,8 @@
 <IfModule mod_rewrite.c>
-	Options -MultiViews
-	RewriteEngine On
+    Options -MultiViews
+    RewriteEngine On
 
-	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteRule ^ index.php [L]
+	RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^ index.php [L]
 </IfModule>